Changeset 5991 for code/branches/console/src/libraries/core

Timestamp:

Oct 24, 2009, 11:35:31 PM (16 years ago)

Author:

rgrieder

Message:

Replaced the load of macros in Debug.h with just two, doing almost exactly the same. The only difference is that the compiler can now completely eliminate COUT with a level higher than the hard debug level.

Location:

code/branches/console/src/libraries/core

Files:

• OrxonoxClass.h (modified) (1 diff)
• input/InputManager.cc (modified) (2 diffs)

code/branches/console/src/libraries/core/OrxonoxClass.h

@@ -42 +42 @@
 #include <set>
 #include <vector>
+
+/**
+@def CCOUT
+    Acts almost exactly like COUT(x), but prepends "ClassName: "
+*/
+#define CCOUT(level) \
+    COUT(level) << this->getIdentifier()->getName() << ": "
 
 namespace orxonox

code/branches/console/src/libraries/core/input/InputManager.cc

@@ -190 +190 @@
             // Exception-safety
             Loki::ScopeGuard guard = Loki::MakeGuard(OIS::InputManager::destroyInputSystem, oisInputManager_);
-            CCOUT(ORX_DEBUG) << "Created OIS input manager." << std::endl;
+            CCOUT(4) << "Created OIS input manager." << std::endl;
 
             if (oisInputManager_->getNumberOfDevices(OIS::OISKeyboard) > 0)
@@ -232 +232 @@
         }
         else
-            CCOUT(ORX_WARNING) << "Warning: No mouse found! Proceeding without mouse support." << std::endl;
+            CCOUT(2) << "Warning: No mouse found! Proceeding without mouse support." << std::endl;
     }