[Orxonox-commit 4107] r8778 - code/branches/output/src/libraries/util/output

landauf at orxonox.net landauf at orxonox.net
Mon Jul 25 15:00:30 CEST 2011


Author: landauf
Date: 2011-07-25 15:00:29 +0200 (Mon, 25 Jul 2011)
New Revision: 8778

Modified:
   code/branches/output/src/libraries/util/output/OutputDefinitions.h
Log:
guess we can afford a small macro in this case

Modified: code/branches/output/src/libraries/util/output/OutputDefinitions.h
===================================================================
--- code/branches/output/src/libraries/util/output/OutputDefinitions.h	2011-07-25 12:47:49 UTC (rev 8777)
+++ code/branches/output/src/libraries/util/output/OutputDefinitions.h	2011-07-25 13:00:29 UTC (rev 8778)
@@ -32,6 +32,9 @@
 #include "util/UtilPrereqs.h"
 #include <string>
 
+#define REGISTER_OUTPUT_CONTEXT(name) \
+    OutputContext name() { static OutputContext value = registerContext(#name); return value; }
+
 namespace orxonox
 {
 namespace test
@@ -68,11 +71,11 @@
 
         namespace
         {
-            OutputContext undefined()   { static OutputContext value = registerContext("undefined");    return value; }
+            REGISTER_OUTPUT_CONTEXT(undefined);
 
-            OutputContext test1()       { static OutputContext value = registerContext("test1");        return value; }
-            OutputContext test2()       { static OutputContext value = registerContext("test2");        return value; }
-            OutputContext output()      { static OutputContext value = registerContext("output");       return value; }
+            REGISTER_OUTPUT_CONTEXT(test1);
+            REGISTER_OUTPUT_CONTEXT(test2);
+            REGISTER_OUTPUT_CONTEXT(output);
         }
     }
 }




More information about the Orxonox-commit mailing list