Changeset 10317 for code/trunk/src/libraries

Timestamp:

Mar 15, 2015, 5:22:19 PM (10 years ago)

Author:

smerkli

Message:

fixed compiler warnings

File:

• code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) (2 diffs)

code/trunk/src/libraries/util/output/OutputDefinitions.h

@@ -49 +49 @@
 #ifndef DISABLE_OUTPUT_CONTEXT_STATIC_CACHE
     #define REGISTER_OUTPUT_CONTEXT(name) \
-        const OutputContextContainer& name() { static OutputContextContainer context = registerContext(#name); return context; }
+        inline const OutputContextContainer& name() { static OutputContextContainer context = registerContext(#name); return context; }
 #else
     #define REGISTER_OUTPUT_CONTEXT(name) \
-        const OutputContextContainer& name() { return registerContext(#name); }
+        inline const OutputContextContainer& name() { return registerContext(#name); }
 #endif
 
@@ -67 +67 @@
 #ifndef DISABLE_OUTPUT_CONTEXT_STATIC_CACHE
     #define REGISTER_OUTPUT_SUBCONTEXT(name, subname) \
-        const OutputContextContainer& subname() { static const OutputContextContainer context = registerContext(#name, #subname); return context; }
+        inline const OutputContextContainer& subname() { static const OutputContextContainer context = registerContext(#name, #subname); return context; }
 #else
     #define REGISTER_OUTPUT_SUBCONTEXT(name, subname) \
-        const OutputContextContainer& subname() { return registerContext(#name, #subname); }
+        inline const OutputContextContainer& subname() { return registerContext(#name, #subname); }
 #endif