[Orxonox-commit 5657] r10317 - code/trunk/src/libraries/util/output

[smerkli at orxonox.net]

Author: smerkli
Date: 2015-03-15 17:22:19 +0100 (Sun, 15 Mar 2015)
New Revision: 10317

Modified:
   code/trunk/src/libraries/util/output/OutputDefinitions.h
Log:
fixed compiler warnings

Modified: code/trunk/src/libraries/util/output/OutputDefinitions.h
===================================================================
--- code/trunk/src/libraries/util/output/OutputDefinitions.h	2015-03-15 14:22:18 UTC (rev 10316)
+++ code/trunk/src/libraries/util/output/OutputDefinitions.h	2015-03-15 16:22:19 UTC (rev 10317)
@@ -48,10 +48,10 @@
 */
 #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
 
 /**
@@ -66,10 +66,10 @@
 */
 #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
 
 // tolua_begin