From f46b1f94e4fdb6644a47b1715325f0595bf8fe77 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 7 Dec 2017 22:16:12 +0000 Subject: Gem 3985c1f4e4e349d2d84d364f3b36878899d6a364 osx/i386 built 'master:3985c1f4e4e349d2d84d364f3b36878899d6a364' for osx/i386 --- Gem/develop/include/Gem/Utils/nop.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Gem/develop') 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) { ; } -- cgit v1.2.1