aboutsummaryrefslogtreecommitdiff
path: root/Gem/develop
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-02-04 16:59:55 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-02-04 16:59:55 +0000
commite77630b4d6239765f8c604bed52fef678fddb205 (patch)
tree947403d41fc6e69af75ae13a1881ed01b22332df /Gem/develop
parent499cc0e0c581f387c34059763a178ae5ff2e1129 (diff)
Gem 8341ea4c831a4e97476df5a5342cdc6fabfacf93 osx/x86_64
built 'master:8341ea4c831a4e97476df5a5342cdc6fabfacf93' for osx/x86_64
Diffstat (limited to 'Gem/develop')
-rw-r--r--Gem/develop/include/Gem/Gem/Dylib.h1
-rw-r--r--Gem/develop/include/Gem/Gem/Exception.h10
-rw-r--r--Gem/develop/pkgconfig/Gem.pc2
3 files changed, 5 insertions, 8 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
diff --git a/Gem/develop/pkgconfig/Gem.pc b/Gem/develop/pkgconfig/Gem.pc
index 94e9704..560d9a8 100644
--- a/Gem/develop/pkgconfig/Gem.pc
+++ b/Gem/develop/pkgconfig/Gem.pc
@@ -9,6 +9,6 @@ includedir=${prefix}/include
# core configuration
Name: Gem
Description: Gem plugins and externals
-Version: 0.94~pre1
+Version: 0.94~pre2
Cflags: -I${includedir}/Gem
Libs: -L${libdir}/Gem