aboutsummaryrefslogtreecommitdiff
path: root/Gem/develop
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2017-12-07 22:16:12 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2017-12-07 22:16:12 +0000
commitf46b1f94e4fdb6644a47b1715325f0595bf8fe77 (patch)
treee774ad8ab20603b2bd2017f9f167e5a2bc6643cb /Gem/develop
parentf5af961e0cec55e5a013bd745cf2967fe945dcc7 (diff)
Gem 3985c1f4e4e349d2d84d364f3b36878899d6a364 osx/i386
built 'master:3985c1f4e4e349d2d84d364f3b36878899d6a364' for osx/i386
Diffstat (limited to 'Gem/develop')
-rw-r--r--Gem/develop/include/Gem/Utils/nop.h7
1 files changed, 4 insertions, 3 deletions
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) { ; }