aboutsummaryrefslogtreecommitdiff
path: root/Gem/develop
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2017-11-27 21:54:03 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2017-11-27 21:54:03 +0000
commitb24636bdefe23c26864e2efaaf05e016208af084 (patch)
tree975004f074d1a068c617e081e3f19aecae4295dd /Gem/develop
parentc0035706f38fb8e85069ec55b53910b810a59f2c (diff)
Gem ebc50987f9794b71fc512d52b46e5c78d6e9218f linux/amd64
built 'noexcept:ebc50987f9794b71fc512d52b46e5c78d6e9218f' for linux/amd64
Diffstat (limited to 'Gem/develop')
-rw-r--r--Gem/develop/include/Gem/Gem/Dylib.h4
-rw-r--r--Gem/develop/include/Gem/Gem/Exception.h12
-rw-r--r--Gem/develop/include/Gem/Utils/GLUtil.h2
-rw-r--r--Gem/develop/include/Gem/Utils/GemString.h3
-rw-r--r--Gem/develop/include/Gem/Utils/any.h13
5 files changed, 22 insertions, 12 deletions
diff --git a/Gem/develop/include/Gem/Gem/Dylib.h b/Gem/develop/include/Gem/Gem/Dylib.h
index 1af65c1..5ed7fda 100644
--- a/Gem/develop/include/Gem/Gem/Dylib.h
+++ b/Gem/develop/include/Gem/Gem/Dylib.h
@@ -28,10 +28,10 @@ class GEM_EXTERN GemDylib {
GemDylib(const CPPExtern*obj,
const std::string libname,
const std::string extension=std::string("")
- ) throw(GemException);
+ ); // throws GemException
GemDylib(const std::string libname,
const std::string extension=std::string("")
- ) throw(GemException);
+ ); // throws GemException
GemDylib(const GemDylib&);
diff --git a/Gem/develop/include/Gem/Gem/Exception.h b/Gem/develop/include/Gem/Gem/Exception.h
index 6df277f..8815b0a 100644
--- a/Gem/develop/include/Gem/Gem/Exception.h
+++ b/Gem/develop/include/Gem/Gem/Exception.h
@@ -39,13 +39,13 @@ typedef struct _text t_object;
class GEM_EXTERN GemException
{
public:
- GemException(void) throw();
- GemException(const char*error) throw();
- GemException(const std::string error) throw();
- virtual ~GemException(void) throw();
+ GemException(void);
+ GemException(const char*error);
+ GemException(const std::string error);
+ virtual ~GemException(void);
- virtual const char *what(void) const throw();
- virtual void report(const char*origin=0) const throw();
+ virtual const char *what(void) const;
+ virtual void report(const char*origin=0) const;
private:
const std::string ErrorString;
};
diff --git a/Gem/develop/include/Gem/Utils/GLUtil.h b/Gem/develop/include/Gem/Utils/GLUtil.h
index c550c07..16fa492 100644
--- a/Gem/develop/include/Gem/Utils/GLUtil.h
+++ b/Gem/develop/include/Gem/Utils/GLUtil.h
@@ -45,7 +45,7 @@ GEM_EXTERN extern int getGLbitfield(int argc, struct _atom *argv);
public:
GLuintMap(const std::string&name);
virtual ~GLuintMap();
- GLuint get(float) throw(GemException&);
+ GLuint get(float); // throws GemException
/* map a GLuint to float; if float is 0, the new mapping is created,
* else we just update an existing one
* updating is especially useful with multiple contexts */
diff --git a/Gem/develop/include/Gem/Utils/GemString.h b/Gem/develop/include/Gem/Utils/GemString.h
index d134f50..d767bf0 100644
--- a/Gem/develop/include/Gem/Utils/GemString.h
+++ b/Gem/develop/include/Gem/Utils/GemString.h
@@ -28,7 +28,8 @@ namespace gem {
GEM_EXTERN std::wstring getVisualLine(const std::wstring&);
/* convert a UTF-8 string to wchar */
- GEM_EXTERN std::wstring toWstring(const char*str) throw(int);
+ // throws 'int', holding the position of the char that couldn't be converted
+ GEM_EXTERN std::wstring toWstring(const char*str);
};
};
diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h
index dff11bb..331a797 100644
--- a/Gem/develop/include/Gem/Utils/any.h
+++ b/Gem/develop/include/Gem/Utils/any.h
@@ -34,9 +34,18 @@ namespace gem
bad_any_cast(const std::type_info& src, const std::type_info& dest)
: result(std::string("bad cast (")+src.name() + "->" + dest.name()+")")
{ }
- virtual ~bad_any_cast(void) throw()
+ virtual ~bad_any_cast(void)
+#if __cplusplus <= 199711L
+ throw()
+#endif
{ }
- virtual const char* what(void) const throw() {
+ virtual const char* what(void) const
+#if __cplusplus > 199711L
+ noexcept
+#else
+ throw()
+#endif
+ {
return result.c_str();
}
const std::string result;