Changeset 8812 for code/branches/output/src/libraries

Timestamp:

Aug 1, 2011, 8:42:26 PM (13 years ago)

Author:

landauf

Message:

removed COUT, CCOUT, and DOUT macros. COUT is now defined as a deprecated function.

Location:

code/branches/output/src/libraries

Files:

• core/OrxonoxClass.h (modified) (1 diff)
• util/Output.h (modified) (1 diff)

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

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

code/branches/output/src/libraries/util/Output.h

@@ -49 +49 @@
         return orxout(level, context());
     }
+
+    // COUT() is deprecated, please use orxout()
+    inline __DEPRECATED__(OutputStream& COUT(int level));
+
+    inline OutputStream& COUT(int)
+    {
+        return orxout();
+    }
 }
 
-#define COUT(level) orxonox::orxout()
-#define DOUT orxonox::orxout()
-
 #endif /* _Output_H__ */