Changeset 8812

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

Files:

• Orxonox.cc (modified) (3 diffs)
• OrxonoxConfig.h.in (modified) (1 diff)
• libraries/core/OrxonoxClass.h (modified) (1 diff)
• libraries/util/Output.h (modified) (1 diff)

code/branches/output/src/Orxonox.cc

@@ -59 +59 @@
 #endif
 {
+    using namespace orxonox;
+
     try
     {
@@ -70 +72 @@
         const int firstArgument = 1;
 #endif
-    
+
         std::string strCmdLine;
         for (int i = firstArgument; i < argc; ++i)
@@ -76 +78 @@
 #endif
 
-        return orxonox::main(strCmdLine);
+        return main(strCmdLine);
     }
     catch (...)
     {
-        COUT(0) << "Orxonox failed to initialise: " << orxonox::Exception::handleMessage() << std::endl;
-        COUT(0) << "Terminating program." << std::endl;
+        orxout(user_error) << "Orxonox failed to initialise: " << orxonox::Exception::handleMessage() << endl;
+        orxout(user_error) << "Terminating program." << endl;
         return 1;
     }

code/branches/output/src/OrxonoxConfig.h.in

@@ -106 +106 @@
 #  else
 #    define __FUNCTIONNAME__
+#  endif
+#endif
+
+// Declare a function deprecated
+#ifndef __DEPRECATED__
+#  if defined(ORXONOX_COMPILER_GCC)
+#    define __DEPRECATED__(function) function __attribute__ ((deprecated))
+#  elif defined(ORXONOX_COMPILER_MSVC)
+#    define __DEPRECATED__(function) __declspec(deprecated) function
+#  else
+#    define __DEPRECATED__(function) function
 #  endif
 #endif

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__ */