aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2016-12-22 10:17:41 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2016-12-22 10:17:41 +0000
commit48351101d6169c18542224f9efa8d26f0af4201a (patch)
tree8c692827347bed3829428b769afcdf1985316cbc
parenta512c47bf92e93b77258aec5ddfb8f366a16beb4 (diff)
Gem cb323f8641d6d15e14a9946ad2b35c74578f6a80 osx/i386
built 'master:cb323f8641d6d15e14a9946ad2b35c74578f6a80' for osx/i386
-rwxr-xr-xGem/Gem.pd_darwinbin5013852 -> 5013852 bytes
-rw-r--r--Gem/develop/include/Gem/Gem/GLStack.h5
-rw-r--r--Gem/develop/include/Gem/Utils/any.h18
-rwxr-xr-xGem/gem_filmAVFoundation.sobin34768 -> 34768 bytes
-rwxr-xr-xGem/gem_imageJPEG.sobin50324 -> 50324 bytes
-rwxr-xr-xGem/gem_imageMAGICK.sobin53336 -> 53344 bytes
-rwxr-xr-xGem/gem_imageSGI.sobin57280 -> 57280 bytes
-rwxr-xr-xGem/gem_imageTIFF.sobin65476 -> 65476 bytes
-rwxr-xr-xGem/gem_modelOBJ.sobin86536 -> 86536 bytes
-rwxr-xr-xGem/gemcocoawindow.pd_darwinbin38616 -> 38616 bytes
-rwxr-xr-xGem/gemglfw2window.pd_darwinbin27172 -> 27172 bytes
-rwxr-xr-xGem/gemglutwindow.pd_darwinbin42536 -> 42536 bytes
-rwxr-xr-xGem/gemsdlwindow.pd_darwinbin39496 -> 39496 bytes
-rwxr-xr-xGem/pix_drum.pd_darwinbin25556 -> 25556 bytes
-rwxr-xr-xGem/pix_fiducialtrack.pd_darwinbin69808 -> 69808 bytes
-rwxr-xr-xGem/pix_hit.pd_darwinbin27280 -> 27280 bytes
-rwxr-xr-xGem/pix_mano.pd_darwinbin39512 -> 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
--- a/Gem/Gem.pd_darwin
+++ b/Gem/Gem.pd_darwin
Binary files 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_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_filmAVFoundation.so b/Gem/gem_filmAVFoundation.so
index 927f612..1616494 100755
--- a/Gem/gem_filmAVFoundation.so
+++ b/Gem/gem_filmAVFoundation.so
Binary files differ
diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so
index 32d3064..07c0a3e 100755
--- a/Gem/gem_imageJPEG.so
+++ b/Gem/gem_imageJPEG.so
Binary files differ
diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so
index fa1eb03..95a1d84 100755
--- a/Gem/gem_imageMAGICK.so
+++ b/Gem/gem_imageMAGICK.so
Binary files differ
diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so
index a6b2e45..64a7e3e 100755
--- a/Gem/gem_imageSGI.so
+++ b/Gem/gem_imageSGI.so
Binary files differ
diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so
index 07b2cae..9314faa 100755
--- a/Gem/gem_imageTIFF.so
+++ b/Gem/gem_imageTIFF.so
Binary files differ
diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so
index 6912b25..b8d9fc6 100755
--- a/Gem/gem_modelOBJ.so
+++ b/Gem/gem_modelOBJ.so
Binary files differ
diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin
index 0763eda..0c75a6d 100755
--- a/Gem/gemcocoawindow.pd_darwin
+++ b/Gem/gemcocoawindow.pd_darwin
Binary files differ
diff --git a/Gem/gemglfw2window.pd_darwin b/Gem/gemglfw2window.pd_darwin
index 2c2c66d..30cee08 100755
--- a/Gem/gemglfw2window.pd_darwin
+++ b/Gem/gemglfw2window.pd_darwin
Binary files differ
diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin
index a104c81..dd8ad34 100755
--- a/Gem/gemglutwindow.pd_darwin
+++ b/Gem/gemglutwindow.pd_darwin
Binary files differ
diff --git a/Gem/gemsdlwindow.pd_darwin b/Gem/gemsdlwindow.pd_darwin
index 67b97eb..f31fa97 100755
--- a/Gem/gemsdlwindow.pd_darwin
+++ b/Gem/gemsdlwindow.pd_darwin
Binary files differ
diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin
index 1e3d4ee..34aa451 100755
--- a/Gem/pix_drum.pd_darwin
+++ b/Gem/pix_drum.pd_darwin
Binary files differ
diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin
index 44cc371..6200752 100755
--- a/Gem/pix_fiducialtrack.pd_darwin
+++ b/Gem/pix_fiducialtrack.pd_darwin
Binary files differ
diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin
index 6ac3ca9..1d98754 100755
--- a/Gem/pix_hit.pd_darwin
+++ b/Gem/pix_hit.pd_darwin
Binary files differ
diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin
index 5a21db6..91b596f 100755
--- a/Gem/pix_mano.pd_darwin
+++ b/Gem/pix_mano.pd_darwin
Binary files differ