diff options
-rwxr-xr-x | Gem/Gem.pd_darwin | bin | 5235348 -> 5235268 bytes | |||
-rw-r--r-- | Gem/develop/include/Gem/Gem/Dylib.h | 4 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Gem/Exception.h | 12 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/GLUtil.h | 2 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/GemString.h | 3 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/any.h | 13 | ||||
-rwxr-xr-x | Gem/gem_filmAVFoundation.so | bin | 71512 -> 71512 bytes | |||
-rwxr-xr-x | Gem/gem_imageJPEG.so | bin | 52104 -> 52104 bytes | |||
-rwxr-xr-x | Gem/gem_imageMAGICK.so | bin | 54504 -> 54504 bytes | |||
-rwxr-xr-x | Gem/gem_imageSGI.so | bin | 59176 -> 59176 bytes | |||
-rwxr-xr-x | Gem/gem_imageTIFF.so | bin | 68244 -> 68244 bytes | |||
-rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 90220 -> 90220 bytes | |||
-rwxr-xr-x | Gem/gemcocoawindow.pd_darwin | bin | 36484 -> 36484 bytes | |||
-rwxr-xr-x | Gem/gemglfw3window.pd_darwin | bin | 38112 -> 38192 bytes | |||
-rwxr-xr-x | Gem/gemglutwindow.pd_darwin | bin | 44428 -> 44428 bytes | |||
-rwxr-xr-x | Gem/gemsdlwindow.pd_darwin | bin | 40632 -> 40704 bytes | |||
-rwxr-xr-x | Gem/pix_drum.pd_darwin | bin | 26312 -> 26312 bytes | |||
-rwxr-xr-x | Gem/pix_fiducialtrack.pd_darwin | bin | 76412 -> 76412 bytes | |||
-rwxr-xr-x | Gem/pix_hit.pd_darwin | bin | 24320 -> 24320 bytes | |||
-rwxr-xr-x | Gem/pix_mano.pd_darwin | bin | 40456 -> 40456 bytes |
20 files changed, 22 insertions, 12 deletions
diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin Binary files differindex 6867ddd..e395a37 100755 --- a/Gem/Gem.pd_darwin +++ b/Gem/Gem.pd_darwin 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; diff --git a/Gem/gem_filmAVFoundation.so b/Gem/gem_filmAVFoundation.so Binary files differindex 75bcedd..7749329 100755 --- a/Gem/gem_filmAVFoundation.so +++ b/Gem/gem_filmAVFoundation.so diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so Binary files differindex db8c1dd..e4a258e 100755 --- a/Gem/gem_imageJPEG.so +++ b/Gem/gem_imageJPEG.so diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so Binary files differindex c5bd862..e696741 100755 --- a/Gem/gem_imageMAGICK.so +++ b/Gem/gem_imageMAGICK.so diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so Binary files differindex 01c232a..562c78c 100755 --- a/Gem/gem_imageSGI.so +++ b/Gem/gem_imageSGI.so diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so Binary files differindex 987e2c7..153974f 100755 --- a/Gem/gem_imageTIFF.so +++ b/Gem/gem_imageTIFF.so diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so Binary files differindex fbf643e..4956b60 100755 --- a/Gem/gem_modelOBJ.so +++ b/Gem/gem_modelOBJ.so diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin Binary files differindex 3ff2084..d682592 100755 --- a/Gem/gemcocoawindow.pd_darwin +++ b/Gem/gemcocoawindow.pd_darwin diff --git a/Gem/gemglfw3window.pd_darwin b/Gem/gemglfw3window.pd_darwin Binary files differindex cfd32c9..d4cf4a6 100755 --- a/Gem/gemglfw3window.pd_darwin +++ b/Gem/gemglfw3window.pd_darwin diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin Binary files differindex 26a1fe5..71ed15e 100755 --- a/Gem/gemglutwindow.pd_darwin +++ b/Gem/gemglutwindow.pd_darwin diff --git a/Gem/gemsdlwindow.pd_darwin b/Gem/gemsdlwindow.pd_darwin Binary files differindex 06d0138..9ffbd13 100755 --- a/Gem/gemsdlwindow.pd_darwin +++ b/Gem/gemsdlwindow.pd_darwin diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin Binary files differindex 4dda3bd..dfc94c6 100755 --- a/Gem/pix_drum.pd_darwin +++ b/Gem/pix_drum.pd_darwin diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin Binary files differindex d58a900..4e4b3b7 100755 --- a/Gem/pix_fiducialtrack.pd_darwin +++ b/Gem/pix_fiducialtrack.pd_darwin diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin Binary files differindex 2be0a84..41ec56b 100755 --- a/Gem/pix_hit.pd_darwin +++ b/Gem/pix_hit.pd_darwin diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin Binary files differindex ad0c2f5..1a219d5 100755 --- a/Gem/pix_mano.pd_darwin +++ b/Gem/pix_mano.pd_darwin |