scoopxyz/revert (#492)

* revert API changes for 1.1.0 release

* add pragma ignore warnings for DLL

* fix typos and add function descriptors (courtesy of @hodoulp)

Author: scoopxyz

export/OpenColorIO/OpenColorIO.h

@@ -30,8 +30,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_OCIO_OPENCOLORIO_H
 #define INCLUDED_OCIO_OPENCOLORIO_H
 
-#include <stdexcept>
+#include <exception>
 #include <iosfwd>
+#include <string>
 #include <cstddef>
 
 #include "OpenColorABI.h"
@@ -84,15 +85,32 @@ OCIO_NAMESPACE_ENTER
     //
     // .. warning:: 
     //    All functions in the Config class can potentially throw this exception.
-    class OCIOEXPORT Exception : public std::runtime_error
+    class OCIOEXPORT Exception : public std::exception
     {
     public:
         //!cpp:function:: Constructor that takes a string as the exception message.
         Exception(const char *) throw();
-        //!cpp:function:: Constructor that takes an existing exception.
+        //!cpp:function:: Constructor that takes an exception pointer.
         Exception(const Exception&) throw();
-        //!cpp:function:: Destructor
+        //!cpp:function:: Constructor that takes an exception pointer and returns an exception pointer (???).
+        Exception& operator=(const Exception&) throw();
+        //!cpp:function::
         virtual ~Exception() throw();
+        //!cpp:function::
+        virtual const char* what() const throw();
+        
+    private:
+        //Add pragma warnings, STL member is private and not consumed by client of DLL
+        #ifdef _WIN32
+        #pragma warning(push)
+        #pragma warning(disable:4251)
+        #endif // _WIN32
+
+        std::string msg_;
+
+        #ifdef _WIN32
+        #pragma warning(pop)
+        #endif // _WIN32
     };
 
     //!cpp:class:: An exception class for errors detected at
@@ -191,6 +209,7 @@ OCIO_NAMESPACE_ENTER
     // See :ref:`developers-usageexamples`
 
     //!cpp:function:: Get the current configuration.
+    
     extern OCIOEXPORT ConstConfigRcPtr GetCurrentConfig();
 
     //!cpp:function:: Set the current configuration. This will then store a copy of the specified config.
@@ -210,9 +229,9 @@ OCIO_NAMESPACE_ENTER
 
         //!cpp:function:: Constructor a default empty configuration.
         static ConfigRcPtr Create();
-        //!cpp:function:: Constructor a configuration using the SYNCOLOR environment variable.
+        //!cpp:function::  Constructor a configuration using the OCIO environmnet variable.
         static ConstConfigRcPtr CreateFromEnv();
-        //!cpp:function:: Constructor a configuration using specific config file.
+        //!cpp:function:: Constructor a configuration using a specific config file.
         static ConstConfigRcPtr CreateFromFile(const char * filename);
         //!cpp:function::
         static ConstConfigRcPtr CreateFromStream(std::istream & istream);
@@ -1151,7 +1170,7 @@ OCIO_NAMESPACE_ENTER
         //!cpp:function::
         GpuLanguage getLanguage() const;
 
-        //!cpp:function:: Set the function name of the shader program 
+        //!cpp:function:: Set the function name of the shader program
         void setFunctionName(const char * name);
         //!cpp:function::
         const char * getFunctionName() const;

src/core/Exception.cpp

@@ -32,19 +32,36 @@ OCIO_NAMESPACE_ENTER
 {
 
     Exception::Exception(const char * msg) throw()
-    : std::runtime_error(msg)
+    : std::exception(),
+      msg_(msg)
     {}
 
     Exception::Exception(const Exception& e) throw()
-    : std::runtime_error(e)
+    : std::exception(),
+      msg_(e.msg_)
     {}
 
+    //*** operator=
+    Exception& Exception::operator=(const Exception& e) throw()
+    {
+        msg_ = e.msg_;
+        return *this;
+    }
+
     //*** ~Exception
     Exception::~Exception() throw()
     {
     }
 
+    //*** what
+    const char* Exception::what() const throw()
+    {
+        return msg_.c_str();
+    }
 
+  
+  
+  
     ExceptionMissingFile::ExceptionMissingFile(const char * msg) throw()
     : Exception(msg)
     {}
@@ -55,52 +72,3 @@ OCIO_NAMESPACE_ENTER
 
 }
 OCIO_NAMESPACE_EXIT
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef OCIO_UNIT_TEST
-
-namespace OCIO = OCIO_NAMESPACE;
-#include "UnitTest.h"
-
-#include <string.h>
-
-
-OIIO_ADD_TEST(Exception, Basic)
-{
-    static const char* dummyErrorStr = "Dummy error";
-
-    // Test 1
-
-    try
-    {
-        throw OCIO::Exception(dummyErrorStr);
-    }
-    catch(const std::exception& ex)
-    {
-        OIIO_CHECK_EQUAL(strcmp(ex.what(), dummyErrorStr), 0);
-    }
-    catch(...)
-    {
-        OIIO_CHECK_ASSERT(!"Wrong exception type");
-    }
-
-    // Test 2
-
-    try
-    {
-        OCIO::Exception ex(dummyErrorStr);
-        throw OCIO::Exception(ex);
-    }
-    catch(const std::exception& ex)
-    {
-        OIIO_CHECK_EQUAL(strcmp(ex.what(), dummyErrorStr), 0);
-    }
-    catch(...)
-    {
-        OIIO_CHECK_ASSERT(!"Wrong exception type");
-    }
-}
-
-#endif // OCIO_UNIT_TEST