fixed line endings

ChriZ982 · Jan 3, 2018 · bd19b06 · bd19b06
1 parent ba1cff8
commit bd19b06
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/OpenHab2RulesGenerator/src/FileParser.cpp b/OpenHab2RulesGenerator/src/FileParser.cpp
@@ -15,7 +15,11 @@ std::vector<std::string> FileParser::read_file(const std::string &filename) {
 
     std::vector<std::string> result;
     for (std::wstring line; getline(file, line);) {
+#ifdef PLATFORM_UNIX
         result.emplace_back(StringUtils::erase_all(std::string(line.begin(), line.end()), {"\r"}));
+#else
+        result.emplace_back(line.begin(), line.end());
+#endif
     }
 
     return result;
@@ -28,7 +32,11 @@ void FileParser::write_file(const std::string &filename, const std::vector<std::
     }
 
     for (const auto &line : lines) {
+#ifdef PLATFORM_UNIX
+        file << std::wstring(line.begin(), line.end()) << "\r\n";
+#else
         file << std::wstring(line.begin(), line.end()) << "\n";
+#endif
     }
 }
 

diff --git a/OpenHab2RulesGenerator/src/Main.cpp b/OpenHab2RulesGenerator/src/Main.cpp
@@ -1,3 +1,7 @@
+#if defined(unix) || defined(__unix__) || defined(__unix)
+#define PLATFORM_UNIX
+#endif
+
 #include <iostream>
 #include "FileParser.h"
 #include "StringUtils.h"