Changeset 8812 for code/branches/output/src/Orxonox.cc

Timestamp:

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

Author:

landauf

Message:

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

File:

• code/branches/output/src/Orxonox.cc (modified) (3 diffs)

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;
     }