Fix exports when compiling DLLs enabled with mingw

mingw seems to be more strict about dll import/export than msvc, inline functions should not be tagged as either. Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
AcademySoftwareFoundation · Aug 27, 2019 · 3674dd2 · 3674dd2
1 parent b4d5d86
commit 3674dd2
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 21 deletions.
diff --git a/IlmBase/Iex/IexBaseExc.h b/IlmBase/Iex/IexBaseExc.h
@@ -132,11 +132,11 @@ class BaseExc: public std::exception
     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() { }                                     \
+        inline name()                         throw(): base (0)    {}  \
+        inline name (const char* text)        throw(): base (text) {}  \
+        inline name (const std::string &text) throw(): base (text) {}  \
+        inline name (std::stringstream &text) throw(): base (text) {}  \
+        inline ~name() throw() { }                                     \
     };
 
 // For backward compatibility.

diff --git a/OpenEXR/IlmImf/ImfGenericInputFile.cpp b/OpenEXR/IlmImf/ImfGenericInputFile.cpp
@@ -41,6 +41,12 @@
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
 
+GenericInputFile::~GenericInputFile ()
+{}
+
+GenericInputFile::GenericInputFile ()
+{}
+
 void GenericInputFile::readMagicNumberAndVersionField(OPENEXR_IMF_INTERNAL_NAMESPACE::IStream& is, int& version)
 {
     //

diff --git a/OpenEXR/IlmImf/ImfGenericInputFile.h b/OpenEXR/IlmImf/ImfGenericInputFile.h
@@ -46,11 +46,11 @@ class GenericInputFile
 {
     public:
         IMF_EXPORT
-        virtual ~GenericInputFile() {}
+        virtual ~GenericInputFile();
 
     protected:
         IMF_EXPORT
-        GenericInputFile() {}
+        GenericInputFile();
         IMF_EXPORT
         void readMagicNumberAndVersionField(OPENEXR_IMF_INTERNAL_NAMESPACE::IStream& is, int& version);
 };

diff --git a/OpenEXR/IlmImf/ImfGenericOutputFile.cpp b/OpenEXR/IlmImf/ImfGenericOutputFile.cpp
@@ -50,11 +50,15 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
 
 using namespace std;
 
+GenericOutputFile::~GenericOutputFile ()
+{}
+
+GenericOutputFile::GenericOutputFile ()
+{}
 
-
 void
-GenericOutputFile::writeMagicNumberAndVersionField (OPENEXR_IMF_INTERNAL_NAMESPACE::OStream& os,
-                                                    const Header& header)
+GenericOutputFile::writeMagicNumberAndVersionField (
+    OPENEXR_IMF_INTERNAL_NAMESPACE::OStream& os, const Header& header)
 {
     OPENEXR_IMF_INTERNAL_NAMESPACE::Xdr::write <OPENEXR_IMF_INTERNAL_NAMESPACE::StreamIO> (os, MAGIC);
 

diff --git a/OpenEXR/IlmImf/ImfGenericOutputFile.h b/OpenEXR/IlmImf/ImfGenericOutputFile.h
@@ -49,11 +49,11 @@ class GenericOutputFile
 {
     public:
         IMF_EXPORT
-        virtual ~GenericOutputFile() {}
+        virtual ~GenericOutputFile();
 
     protected:
         IMF_EXPORT
-        GenericOutputFile() {}
+        GenericOutputFile();
         IMF_EXPORT
         void writeMagicNumberAndVersionField (OPENEXR_IMF_INTERNAL_NAMESPACE::OStream& os, const Header& header);
         IMF_EXPORT

diff --git a/OpenEXR/IlmImf/ImfName.h b/OpenEXR/IlmImf/ImfName.h
@@ -77,9 +77,9 @@ class Name
     // Access to the string
     //---------------------
 
-    IMF_EXPORT
+    inline
     const char *	text () const		{return _text;}
-    IMF_EXPORT
+    inline
     const char *	operator * () const	{return _text;}
 
     //---------------

diff --git a/OpenEXR/IlmImf/ImfPreviewImage.h b/OpenEXR/IlmImf/ImfPreviewImage.h
@@ -109,26 +109,26 @@ class PreviewImage
     // Access to width, height and to the pixel array
     //-----------------------------------------------
 
-    IMF_EXPORT
+    inline
     unsigned int	width () const	{return _width;}
-    IMF_EXPORT
+    inline
     unsigned int	height () const	{return _height;}
 
-    IMF_EXPORT
+    inline
     PreviewRgba *	pixels ()	{return _pixels;}
-    IMF_EXPORT
+    inline
     const PreviewRgba *	pixels () const	{return _pixels;}
 
 
     //----------------------------
     // Access to individual pixels
     //----------------------------
 
-    IMF_EXPORT
+    inline
     PreviewRgba &	pixel (unsigned int x, unsigned int y)
     					{return _pixels[y * _width + x];}
 
-    IMF_EXPORT
+    inline
     const PreviewRgba &	pixel (unsigned int x, unsigned int y) const
     					{return _pixels[y * _width + x];}
 

diff --git a/OpenEXR/IlmImf/ImfStdIO.cpp b/OpenEXR/IlmImf/ImfStdIO.cpp
@@ -375,5 +375,10 @@ StdOSStream::seekp (Int64 pos)
     checkError (_os);
 }
 
+std::string
+StdOSStream::str () const
+{
+    return _os.str ();
+}
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EXIT
diff --git a/OpenEXR/IlmImf/ImfStdIO.h b/OpenEXR/IlmImf/ImfStdIO.h
@@ -165,7 +165,7 @@ class StdOSStream: public OPENEXR_IMF_INTERNAL_NAMESPACE::OStream
     virtual void	seekp (Int64 pos);
 
     IMF_EXPORT
-    std::string		str () const {return _os.str();}
+    std::string		str () const;
 
   private: