"fbe.h" windows header file problem hope to modify #67

Author: Ivan Shynkarenka

include/generator_cpp.h

@@ -49,6 +49,7 @@ class GeneratorCpp : public Generator
     void GenerateWarningsFooter();
     void GenerateFooter();
     void GenerateImports();
+    void GenerateImportsSource();
     void GenerateImports(const std::string& source);
     void GenerateImports(const std::shared_ptr<Package>& p);
     void GenerateImportsModels(const std::shared_ptr<Package>& p, bool final);

proto/fbe.cpp

@@ -7,6 +7,17 @@
 
 #include "fbe.h"
 
+#if defined(_WIN32) || defined(_WIN64)
+#include <windows.h>
+#undef DELETE
+#undef ERROR
+#undef HOST_NOT_FOUND
+#undef Yield
+#undef min
+#undef max
+#undef uuid_t
+#endif
+
 namespace FBE {
 
 std::string buffer_t::base64encode() const

proto/fbe.h

@@ -43,7 +43,6 @@
 #include <uuid/uuid.h>
 #undef HOST_NOT_FOUND
 #elif defined(_WIN32) || defined(_WIN64)
-#include <windows.h>
 #undef DELETE
 #undef ERROR
 #undef HOST_NOT_FOUND

source/generator_cpp.cpp

@@ -194,7 +194,6 @@ void GeneratorCpp::GenerateImports()
 #include <uuid/uuid.h>
 #undef HOST_NOT_FOUND
 #elif defined(_WIN32) || defined(_WIN64)
-#include <windows.h>
 #undef DELETE
 #undef ERROR
 #undef HOST_NOT_FOUND
@@ -219,6 +218,27 @@ void GeneratorCpp::GenerateImports()
     }
 }
 
+void GeneratorCpp::GenerateImportsSource()
+{
+    std::string code = R"CODE(
+#if defined(_WIN32) || defined(_WIN64)
+#include <windows.h>
+#undef DELETE
+#undef ERROR
+#undef HOST_NOT_FOUND
+#undef Yield
+#undef min
+#undef max
+#undef uuid_t
+#endif
+)CODE";
+
+    // Prepare code template
+    code = std::regex_replace(code, std::regex("\n"), EndLine());
+
+    Write(code);
+}
+
 void GeneratorCpp::GenerateImports(const std::string& source)
 {
     WriteLine();
@@ -6332,6 +6352,9 @@ void GeneratorCpp::GenerateFBE_Source(const CppCommon::Path& path)
     // Generate imports
     GenerateImports("fbe.h");
 
+    // Generate imports source
+    GenerateImportsSource();
+
     // Generate namespace begin
     WriteLine();
     WriteLineIndent("namespace FBE {");