Fix c++11 detection issue on windows. Fix ilmbase DLL export warnings

AcademySoftwareFoundation · Aug 8, 2018 · 7376f9b · 7376f9b
1 parent 99ecfca
commit 7376f9b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
@@ -142,9 +142,10 @@ ENDIF ()
 
 IF (FORCE_CXX03)
   FILE ( APPEND  ${CMAKE_CURRENT_BINARY_DIR}/config/IlmBaseConfig.h "#define ILMBASE_FORCE_CXX03 1\n" )
-ELSE ()
+ELIF (NOT WIN32)
   # really only care about c++11 right now for the threading bits, but this can be changed to 14
   # when needed...
+  # Note that the __cplusplus check is not valid under MSVC
   FILE ( APPEND  ${CMAKE_CURRENT_BINARY_DIR}/config/IlmBaseConfig.h "#if __cplusplus < 201103L\n# error \"Modern C++ 11/14 not enabled but force cxx03 not set\"\n#endif\n" )
 ENDIF ()
 

diff --git a/IlmBase/Iex/IexBaseExc.h b/IlmBase/Iex/IexBaseExc.h
@@ -137,15 +137,15 @@ class BaseExc: public std::string, public std::exception
 // class derived directly or indirectly from BaseExc:
 //-----------------------------------------------------
 
-#define DEFINE_EXC_EXP(exp, name, base)                         \
-    class exp name: public base                                 \
-    {                                                           \
-      public:                                                   \
-        name()                         throw(): base (0)    {}  \
-        name (const char* text)        throw(): base (text) {}  \
-        name (const std::string &text) throw(): base (text) {}  \
-        name (std::stringstream &text) throw(): base (text) {}  \
-        ~name() throw() { }                                     \
+#define DEFINE_EXC_EXP(exp, name, base)                             \
+    class name: public base                                         \
+    {                                                               \
+      public:                                                       \
+        exp name()                         throw(): base (0)    {}  \
+        exp name (const char* text)        throw(): base (text) {}  \
+        exp name (const std::string &text) throw(): base (text) {}  \
+        exp name (std::stringstream &text) throw(): base (text) {}  \
+        exp ~name() throw() { }                                     \
     };
 
 // For backward compatibility.

diff --git a/IlmBase/IlmThread/IlmThread.h b/IlmBase/IlmThread/IlmThread.h
@@ -119,15 +119,15 @@ ILMTHREAD_INTERNAL_NAMESPACE_HEADER_ENTER
 ILMTHREAD_EXPORT bool supportsThreads ();
 
 
-class ILMTHREAD_EXPORT Thread
+class Thread
 {
   public:
 
-    Thread ();
-    virtual ~Thread ();
+    ILMTHREAD_EXPORT Thread ();
+    ILMTHREAD_EXPORT virtual ~Thread ();
 
-    void         start ();
-    virtual void run () = 0;
+    ILMTHREAD_EXPORT void         start ();
+    ILMTHREAD_EXPORT virtual void run () = 0;
 
   private: