From e105e52be7eae6e3a5221c20d6e228cb7a59544b Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 7 Dec 2017 20:42:45 +0000 Subject: Gem 3985c1f4e4e349d2d84d364f3b36878899d6a364 linux/amd64 built 'master:3985c1f4e4e349d2d84d364f3b36878899d6a364' for linux/amd64 --- Gem/Gem.pd_linux | Bin 32585872 -> 32586048 bytes Gem/develop/include/Gem/Utils/nop.h | 7 ++++--- Gem/gem_videoUNICAP.so | Bin 553376 -> 553440 bytes Gem/gem_videoV4L.so | Bin 479195 -> 479251 bytes Gem/gem_videoV4L2.so | Bin 603735 -> 603735 bytes 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux index 4d0e8e6..d0d9a9b 100755 Binary files a/Gem/Gem.pd_linux and b/Gem/Gem.pd_linux differ diff --git a/Gem/develop/include/Gem/Utils/nop.h b/Gem/develop/include/Gem/Utils/nop.h index 8431ef2..75875ef 100644 --- a/Gem/develop/include/Gem/Utils/nop.h +++ b/Gem/develop/include/Gem/Utils/nop.h @@ -15,10 +15,11 @@ LOG #ifndef _INCLUDE__GEM_UTILS_NOP_H_ #define _INCLUDE__GEM_UTILS_NOP_H_ -#if __STDC_VERSION__ >= 199901L -# define nop(...) +#if __cplusplus > 199711L || __STDC_VERSION__ >= 199901L +# define nop(...) do {} while (0) #else -# define nop +static inline void gem__nop(...) { ; } +# define nop gem__nop #endif static inline void gem__nop_post(void) { ; } diff --git a/Gem/gem_videoUNICAP.so b/Gem/gem_videoUNICAP.so index ac51af8..82d1054 100755 Binary files a/Gem/gem_videoUNICAP.so and b/Gem/gem_videoUNICAP.so differ diff --git a/Gem/gem_videoV4L.so b/Gem/gem_videoV4L.so index dbf1bb7..9030af2 100755 Binary files a/Gem/gem_videoV4L.so and b/Gem/gem_videoV4L.so differ diff --git a/Gem/gem_videoV4L2.so b/Gem/gem_videoV4L2.so index 9bf98f7..91df1e3 100755 Binary files a/Gem/gem_videoV4L2.so and b/Gem/gem_videoV4L2.so differ -- cgit v1.2.1