diff options
author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2016-12-22 09:43:00 +0000 |
---|---|---|
committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2016-12-22 09:43:00 +0000 |
commit | 0eebd0e55dd610971a6ccd711278cbc480a4361e (patch) | |
tree | dd63fffe7325128ddbc640c1d559b268658b8780 | |
parent | 315d1e5fc3e8367c187c39fda97cd6439765a9d7 (diff) |
Gem cb323f8641d6d15e14a9946ad2b35c74578f6a80 linux/amd64
built 'master:cb323f8641d6d15e14a9946ad2b35c74578f6a80' for linux/amd64
-rwxr-xr-x | Gem/Gem.pd_linux | bin | 28637580 -> 28639844 bytes | |||
-rw-r--r-- | Gem/develop/include/Gem/Gem/GLStack.h | 5 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/any.h | 18 | ||||
-rwxr-xr-x | Gem/gem_filmAVIPLAY.so | bin | 166673 -> 166657 bytes | |||
-rwxr-xr-x | Gem/gem_filmGMERLIN.so | bin | 146947 -> 146947 bytes | |||
-rwxr-xr-x | Gem/gem_filmMPEG3.so | bin | 174458 -> 174450 bytes | |||
-rwxr-xr-x | Gem/gem_filmQT4L.so | bin | 163647 -> 163639 bytes | |||
-rwxr-xr-x | Gem/gem_imageJPEG.so | bin | 178250 -> 178250 bytes | |||
-rwxr-xr-x | Gem/gem_imageMAGICK.so | bin | 256783 -> 256791 bytes | |||
-rwxr-xr-x | Gem/gem_imageSGI.so | bin | 224649 -> 224649 bytes | |||
-rwxr-xr-x | Gem/gem_imageTIFF.so | bin | 278694 -> 278710 bytes | |||
-rwxr-xr-x | Gem/gem_modelOBJ.so | bin | 617065 -> 617073 bytes | |||
-rwxr-xr-x | Gem/gem_recordQT4L.so | bin | 427725 -> 427725 bytes | |||
-rwxr-xr-x | Gem/gem_recordV4L.so | bin | 99944 -> 99944 bytes | |||
-rwxr-xr-x | Gem/gem_recordV4L2.so | bin | 102539 -> 102539 bytes | |||
-rwxr-xr-x | Gem/gem_videoV4L.so | bin | 458875 -> 458891 bytes | |||
-rwxr-xr-x | Gem/gem_videoV4L2.so | bin | 552769 -> 552809 bytes | |||
-rwxr-xr-x | Gem/gem_videoVNC.so | bin | 220801 -> 220625 bytes |
18 files changed, 19 insertions, 4 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux Binary files differindex 37f0de3..b68db8d 100755 --- a/Gem/Gem.pd_linux +++ b/Gem/Gem.pd_linux 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_ptr<Data>data; +#else + std::unique_ptr<Data>data; +#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 <typename T> any(const T& x) : table(NULL), object(NULL) { table = any_detail::get_table<T>::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_filmAVIPLAY.so b/Gem/gem_filmAVIPLAY.so Binary files differindex 3a9a123..ddec087 100755 --- a/Gem/gem_filmAVIPLAY.so +++ b/Gem/gem_filmAVIPLAY.so diff --git a/Gem/gem_filmGMERLIN.so b/Gem/gem_filmGMERLIN.so Binary files differindex 0b9eb5e..d198264 100755 --- a/Gem/gem_filmGMERLIN.so +++ b/Gem/gem_filmGMERLIN.so diff --git a/Gem/gem_filmMPEG3.so b/Gem/gem_filmMPEG3.so Binary files differindex 0e65189..ee4ef11 100755 --- a/Gem/gem_filmMPEG3.so +++ b/Gem/gem_filmMPEG3.so diff --git a/Gem/gem_filmQT4L.so b/Gem/gem_filmQT4L.so Binary files differindex 158ce03..12c7b9b 100755 --- a/Gem/gem_filmQT4L.so +++ b/Gem/gem_filmQT4L.so diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so Binary files differindex 7e55dd4..61fc52d 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 064b179..1ca4db7 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 6cf0021..6f07346 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 3340968..e79b09a 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 0b982eb..f264739 100755 --- a/Gem/gem_modelOBJ.so +++ b/Gem/gem_modelOBJ.so diff --git a/Gem/gem_recordQT4L.so b/Gem/gem_recordQT4L.so Binary files differindex bfed282..7f08934 100755 --- a/Gem/gem_recordQT4L.so +++ b/Gem/gem_recordQT4L.so diff --git a/Gem/gem_recordV4L.so b/Gem/gem_recordV4L.so Binary files differindex c338163..b9df877 100755 --- a/Gem/gem_recordV4L.so +++ b/Gem/gem_recordV4L.so diff --git a/Gem/gem_recordV4L2.so b/Gem/gem_recordV4L2.so Binary files differindex 15d03f7..4a80dbe 100755 --- a/Gem/gem_recordV4L2.so +++ b/Gem/gem_recordV4L2.so diff --git a/Gem/gem_videoV4L.so b/Gem/gem_videoV4L.so Binary files differindex 68707c2..c756a31 100755 --- a/Gem/gem_videoV4L.so +++ b/Gem/gem_videoV4L.so diff --git a/Gem/gem_videoV4L2.so b/Gem/gem_videoV4L2.so Binary files differindex 87f0981..013a653 100755 --- a/Gem/gem_videoV4L2.so +++ b/Gem/gem_videoV4L2.so diff --git a/Gem/gem_videoVNC.so b/Gem/gem_videoVNC.so Binary files differindex b938250..6d42c8a 100755 --- a/Gem/gem_videoVNC.so +++ b/Gem/gem_videoVNC.so |