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

dimitre · web-flow · commit b14a44f0c63f · 2024-10-20T22:00:48.000-03:00
diff --git a/apps/projectGenerator b/apps/projectGenerator
@@ -1 +1 @@
-Subproject commit a59f24da613b6094cd22cdd15d5748eb221f9c1f
+Subproject commit 51f2ad14aad8031ca1e0001791089d0742fa1699
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
