From 48351101d6169c18542224f9efa8d26f0af4201a Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 22 Dec 2016 10:17:41 +0000 Subject: Gem cb323f8641d6d15e14a9946ad2b35c74578f6a80 osx/i386 built 'master:cb323f8641d6d15e14a9946ad2b35c74578f6a80' for osx/i386 --- Gem/Gem.pd_darwin | Bin 5013852 -> 5013852 bytes Gem/develop/include/Gem/Gem/GLStack.h | 5 +++++ Gem/develop/include/Gem/Utils/any.h | 18 ++++++++++++++---- Gem/gem_filmAVFoundation.so | Bin 34768 -> 34768 bytes Gem/gem_imageJPEG.so | Bin 50324 -> 50324 bytes Gem/gem_imageMAGICK.so | Bin 53336 -> 53344 bytes Gem/gem_imageSGI.so | Bin 57280 -> 57280 bytes Gem/gem_imageTIFF.so | Bin 65476 -> 65476 bytes Gem/gem_modelOBJ.so | Bin 86536 -> 86536 bytes Gem/gemcocoawindow.pd_darwin | Bin 38616 -> 38616 bytes Gem/gemglfw2window.pd_darwin | Bin 27172 -> 27172 bytes Gem/gemglutwindow.pd_darwin | Bin 42536 -> 42536 bytes Gem/gemsdlwindow.pd_darwin | Bin 39496 -> 39496 bytes Gem/pix_drum.pd_darwin | Bin 25556 -> 25556 bytes Gem/pix_fiducialtrack.pd_darwin | Bin 69808 -> 69808 bytes Gem/pix_hit.pd_darwin | Bin 27280 -> 27280 bytes Gem/pix_mano.pd_darwin | Bin 39512 -> 39512 bytes 17 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin index 4a55baa..94354b1 100755 Binary files a/Gem/Gem.pd_darwin and b/Gem/Gem.pd_darwin differ diff --git a/Gem/develop/include/Gem/Gem/GLStack.h b/Gem/develop/include/Gem/Gem/GLStack.h index 2584578..4c9037c 100644 --- a/Gem/develop/include/Gem/Gem/GLStack.h +++ b/Gem/develop/include/Gem/Gem/GLStack.h @@ -65,7 +65,12 @@ class GEM_EXTERN GLStack { private: class Data; + // try using unique_ptr<> if it is supported +#if __cplusplus < 201103L std::auto_ptrdata; +#else + std::unique_ptrdata; +#endif }; } /* namespace gem */ diff --git a/Gem/develop/include/Gem/Utils/any.h b/Gem/develop/include/Gem/Utils/any.h index fc66b46..dff11bb 100644 --- a/Gem/develop/include/Gem/Utils/any.h +++ b/Gem/develop/include/Gem/Utils/any.h @@ -132,12 +132,19 @@ namespace gem template any(const T& x) : table(NULL), object(NULL) { table = any_detail::get_table::get(); +#if defined(__GNUC__) && __GNUC__ >= 6 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wplacement-new" +#endif if (sizeof(T) <= sizeof(void*)) { new(&object) T(x); } else { object = new T(x); } +#if defined(__GNUC__) && __GNUC__ >= 6 +# pragma GCC diagnostic pop +#endif } any(void) : table(NULL), object(NULL) { @@ -181,14 +188,16 @@ namespace gem if (table == x_table) { // if so, we can avoid deallocating and resuse memory +#if defined(__GNUC__) && __GNUC__ >= 6 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wplacement-new" +#endif if (sizeof(T) <= sizeof(void*)) { // create copy on-top of object pointer itself - new(&object) T(x); } else { // create copy on-top of old version - new(object) T(x); } } @@ -196,16 +205,17 @@ namespace gem reset(); if (sizeof(T) <= sizeof(void*)) { // create copy on-top of object pointer itself - new(&object) T(x); // update table pointer - table = x_table; } else { object = new T(x); table = x_table; } +#if defined(__GNUC__) && __GNUC__ >= 6 +# pragma GCC diagnostic pop +#endif } return *this; } diff --git a/Gem/gem_filmAVFoundation.so b/Gem/gem_filmAVFoundation.so index 927f612..1616494 100755 Binary files a/Gem/gem_filmAVFoundation.so and b/Gem/gem_filmAVFoundation.so differ diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so index 32d3064..07c0a3e 100755 Binary files a/Gem/gem_imageJPEG.so and b/Gem/gem_imageJPEG.so differ diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so index fa1eb03..95a1d84 100755 Binary files a/Gem/gem_imageMAGICK.so and b/Gem/gem_imageMAGICK.so differ diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so index a6b2e45..64a7e3e 100755 Binary files a/Gem/gem_imageSGI.so and b/Gem/gem_imageSGI.so differ diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so index 07b2cae..9314faa 100755 Binary files a/Gem/gem_imageTIFF.so and b/Gem/gem_imageTIFF.so differ diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so index 6912b25..b8d9fc6 100755 Binary files a/Gem/gem_modelOBJ.so and b/Gem/gem_modelOBJ.so differ diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin index 0763eda..0c75a6d 100755 Binary files a/Gem/gemcocoawindow.pd_darwin and b/Gem/gemcocoawindow.pd_darwin differ diff --git a/Gem/gemglfw2window.pd_darwin b/Gem/gemglfw2window.pd_darwin index 2c2c66d..30cee08 100755 Binary files a/Gem/gemglfw2window.pd_darwin and b/Gem/gemglfw2window.pd_darwin differ diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin index a104c81..dd8ad34 100755 Binary files a/Gem/gemglutwindow.pd_darwin and b/Gem/gemglutwindow.pd_darwin differ diff --git a/Gem/gemsdlwindow.pd_darwin b/Gem/gemsdlwindow.pd_darwin index 67b97eb..f31fa97 100755 Binary files a/Gem/gemsdlwindow.pd_darwin and b/Gem/gemsdlwindow.pd_darwin differ diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin index 1e3d4ee..34aa451 100755 Binary files a/Gem/pix_drum.pd_darwin and b/Gem/pix_drum.pd_darwin differ diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin index 44cc371..6200752 100755 Binary files a/Gem/pix_fiducialtrack.pd_darwin and b/Gem/pix_fiducialtrack.pd_darwin differ diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin index 6ac3ca9..1d98754 100755 Binary files a/Gem/pix_hit.pd_darwin and b/Gem/pix_hit.pd_darwin differ diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin index 5a21db6..91b596f 100755 Binary files a/Gem/pix_mano.pd_darwin and b/Gem/pix_mano.pd_darwin differ -- cgit v1.2.1