iso646.h in windows — and / or templates fix (#8154)

openframeworks · Oct 21, 2024 · b14a44f · b14a44f
1 parent 09eb813
commit b14a44f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/apps/projectGenerator b/apps/projectGenerator
diff --git a/libs/openFrameworks/ofMain.h b/libs/openFrameworks/ofMain.h
@@ -18,10 +18,6 @@
 #include "ofJson.h"
 #include "ofXml.h"
 
-#ifdef TARGET_WIN32
-#include <iso646.h>
-#endif
-
 //--------------------------
 // types
 #include "ofColor.h"

diff --git a/libs/openFrameworks/types/ofParameter.h b/libs/openFrameworks/types/ofParameter.h
@@ -12,6 +12,10 @@
 #include "ofRectangle.h"
 #include "ofUtils.h" // ofToString
 
+#ifdef TARGET_WIN32
+#include <iso646.h>
+#endif
+
 template <typename ParameterType>
 class ofParameter;
 

diff --git a/libs/openFrameworks/utils/ofRandomDistributions.h b/libs/openFrameworks/utils/ofRandomDistributions.h
@@ -2,8 +2,13 @@
 #define OF_RANDOM_DISTRIBUTIONS_H_
 
 #include "ofRandomEngine.h"
-#include <iostream>
 #include "ofColor.h"
+#include <iostream>
+
+#ifdef TARGET_WIN32
+#include <iso646.h>
+#endif
+
 
 // https://gist.github.com/imneme/540829265469e673d045
 // https://github.com/effolkronium/random/tree/master