Changeset 8787

Timestamp:

Jul 25, 2011, 11:53:17 PM (13 years ago)

Author:

landauf

Message:

removed Debug.h and OutputHandler. removed test namespace from new output system.
doesn't compile.

Location:

code/branches/output/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• Debug.h (deleted)
• Output.h (modified) (2 diffs)
• OutputHandler.cc (deleted)
• OutputHandler.h (deleted)
• UtilPrereqs.h (modified) (1 diff)
• output/ConsoleWriter.cc (modified) (2 diffs)
• output/ConsoleWriter.h (modified) (2 diffs)
• output/LogWriter.cc (modified) (2 diffs)
• output/LogWriter.h (modified) (2 diffs)
• output/MemoryWriter.cc (modified) (2 diffs)
• output/MemoryWriter.h (modified) (2 diffs)
• output/OutputDefinitions.h (modified) (2 diffs)
• output/OutputListener.cc (modified) (2 diffs)
• output/OutputListener.h (modified) (2 diffs)
• output/OutputManager.cc (modified) (2 diffs)
• output/OutputManager.h (modified) (3 diffs)
• output/OutputStream.cc (modified) (2 diffs)
• output/OutputStream.h (modified) (2 diffs)

code/branches/output/src/libraries/util/CMakeLists.txt

@@ -26 +26 @@
   CRC32.cc
   ExprParser.cc
-  OutputHandler.cc
   Scope.cc
   ScopedSingletonManager.cc

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

@@ -35 +35 @@
 namespace orxonox
 {
-namespace test
-{
     // Just for convenience
     using std::endl;
@@ -53 +51 @@
     }
 }
-}
+
+#define COUT(level) orxonox::orxout()
+#define DOUT orxonox::orxout()
 
 #endif /* _Output_H__ */

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

@@ -88 +88 @@
     class ExprParser;
     class MultiType;
-    class OutputHandler;
     class OutputListener;
+    class OutputManager;
+    class OutputStream;
     template <ScopeID::Value>
     class Scope;

code/branches/output/src/libraries/util/output/ConsoleWriter.cc

@@ -32 +32 @@
 
 namespace orxonox
-{
-namespace test
 {
     ConsoleWriter::ConsoleWriter()
@@ -78 +76 @@
     }
 }
-}

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

@@ -35 +35 @@
 namespace orxonox
 {
-namespace test
-{
     class _UtilExport ConsoleWriter : public OutputListener
     {
@@ -56 +54 @@
     };
 }
-}
 
 #endif /* _ConsoleWriter_H__ */

code/branches/output/src/libraries/util/output/LogWriter.cc

@@ -35 +35 @@
 
 namespace orxonox
-{
-namespace test
 {
     LogWriter::LogWriter()
@@ -128 +126 @@
     }
 }
-}

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

@@ -38 +38 @@
 namespace orxonox
 {
-namespace test
-{
     class _UtilExport LogWriter : public OutputListener
     {
@@ -67 +65 @@
     };
 }
-}
 
 #endif /* _LogWriter_H__ */

code/branches/output/src/libraries/util/output/MemoryWriter.cc

@@ -32 +32 @@
 
 namespace orxonox
-{
-namespace test
 {
     MemoryWriter::MemoryWriter()
@@ -70 +68 @@
     }
 }
-}

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

@@ -35 +35 @@
 namespace orxonox
 {
-namespace test
-{
     class _UtilExport MemoryWriter : public OutputListener
     {
@@ -66 +64 @@
     };
 }
-}
 
 #endif /* _MemoryWriter_H__ */

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

@@ -37 +37 @@
 
 namespace orxonox
-{
-namespace test
 {
     typedef uint16_t OutputLevel;
@@ -80 +78 @@
     }
 }
-}
 
 #endif /* _OutputDefinitions_H__ */

code/branches/output/src/libraries/util/output/OutputListener.cc

@@ -32 +32 @@
 
 namespace orxonox
-{
-namespace test
 {
     OutputListener::OutputListener()
@@ -77 +75 @@
     }
 }
-}

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

@@ -38 +38 @@
 namespace orxonox
 {
-namespace test
-{
     class _UtilExport OutputListener
     {
@@ -72 +70 @@
     };
 }
-}
 
 #endif /* _OutputListener_H__ */

code/branches/output/src/libraries/util/output/OutputManager.cc

@@ -34 +34 @@
 
 namespace orxonox
-{
-namespace test
 {
     OutputManager::OutputManager()
@@ -203 +201 @@
     }
 }
-}

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

@@ -33 +33 @@
 
 #include <vector>
-
 #include <boost/bimap.hpp>
 
@@ -40 +39 @@
 namespace orxonox
 {
-namespace test
-{
-    class OutputListener;
-
     class _UtilExport OutputManager
     {
@@ -87 +82 @@
     };
 }
-}
 
 #endif /* _OutputManager_H__ */

code/branches/output/src/libraries/util/output/OutputStream.cc

@@ -33 +33 @@
 namespace orxonox
 {
-namespace test
-{
     OutputStream::OutputStream()
     {
@@ -56 +54 @@
     }
 }
-}

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

@@ -37 +37 @@
 
 namespace orxonox
-{
-namespace test
 {
     class OutputStream : public std::ostringstream
@@ -81 +79 @@
     };
 }
-}
 
 #endif /* _OutputStream_H__ */