Gem 8341ea4c831a4e97476df5a5342cdc6fabfacf93 osx/i386

built 'master:8341ea4c831a4e97476df5a5342cdc6fabfacf93' for osx/i386

2 files changed, 4 insertions, 7 deletions

diff --git a/Gem/develop/include/Gem/Gem/Dylib.h b/Gem/develop/include/Gem/Gem/Dylib.h
index f145e8b..0738fca 100644
--- a/Gem/develop/include/Gem/Gem/Dylib.h
+++ b/Gem/develop/include/Gem/Gem/Dylib.h
@@ -14,6 +14,7 @@ LOG
 #define _INCLUDE__GEM_GEM_DYLIB_H_
 
 #include "Gem/Exception.h"
+#include <string>
 
 
 /* an opaque handle to the platform specific library handle */
diff --git a/Gem/develop/include/Gem/Gem/Exception.h b/Gem/develop/include/Gem/Gem/Exception.h
index d09a480..96051e0 100644
--- a/Gem/develop/include/Gem/Gem/Exception.h
+++ b/Gem/develop/include/Gem/Gem/Exception.h
@@ -32,22 +32,18 @@ DESCRIPTION
 #define _INCLUDE__GEM_GEM_EXCEPTION_H_
 
 #include "Gem/ExportDef.h"
-#include <string>
+#include <stdexcept>
+
 
 typedef struct _text t_object;
 
-class GEM_EXTERN GemException
+class GEM_EXTERN GemException : public std::runtime_error
 {
 public:
   GemException(void);
   explicit GemException(const char*error);
   explicit GemException(const std::string&error);
-  virtual ~GemException(void);
-
-  virtual const char *what(void) const;
   virtual void report(const char*origin=0) const;
-private:
-  const char*ErrorString;
 };
 
 namespace gem