Context Navigation

← Previous Change
Next Change →

Changeset 8787 for code/branches/output/src

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:

: 3 deleted
: 16 edited

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)

Legend:

: Unmodified
: Added
: Removed

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

r8780	r8787
26	26	CRC32.cc
27	27	ExprParser.cc
28		~~OutputHandler.cc~~
29	28	Scope.cc
30	29	ScopedSingletonManager.cc

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

r8779	r8787
35	35	namespace orxonox
36	36	{
37		~~namespace test~~
38		{
39	37	// Just for convenience
40	38	using std::endl;
…	…
53	51	}
54	52	}
55		}
	53
	54	#define COUT(level) orxonox::orxout()
	55	#define DOUT orxonox::orxout()
56	56
57	57	#endif /* _Output_H__ */

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

-                      r8729
+                      r8787
     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

r8780	r8787
32	32
33	33	namespace orxonox
34		{
35		~~namespace test~~
36	34	{
37	35	ConsoleWriter::ConsoleWriter()
…	…
78	76	}
79	77	}
80		}

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

r8780	r8787
35	35	namespace orxonox
36	36	{
37		~~namespace test~~
38		{
39	37	class _UtilExport ConsoleWriter : public OutputListener
40	38	{
…	…
56	54	};
57	55	}
58		}
59	56
60	57	#endif /* _ConsoleWriter_H__ */

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

r8777	r8787
35	35
36	36	namespace orxonox
37		{
38		~~namespace test~~
39	37	{
40	38	LogWriter::LogWriter()
…	…
128	126	}
129	127	}
130		}

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

r8774	r8787
38	38	namespace orxonox
39	39	{
40		~~namespace test~~
41		{
42	40	class _UtilExport LogWriter : public OutputListener
43	41	{
…	…
67	65	};
68	66	}
69		}
70	67
71	68	#endif /* _LogWriter_H__ */

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

r8777	r8787
32	32
33	33	namespace orxonox
34		{
35		~~namespace test~~
36	34	{
37	35	MemoryWriter::MemoryWriter()
…	…
70	68	}
71	69	}
72		}

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

r8774	r8787
35	35	namespace orxonox
36	36	{
37		~~namespace test~~
38		{
39	37	class _UtilExport MemoryWriter : public OutputListener
40	38	{
…	…
66	64	};
67	65	}
68		}
69	66
70	67	#endif /* _MemoryWriter_H__ */

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

r8778	r8787
37	37
38	38	namespace orxonox
39		{
40		~~namespace test~~
41	39	{
42	40	typedef uint16_t OutputLevel;
…	…
80	78	}
81	79	}
82		}
83	80
84	81	#endif /* _OutputDefinitions_H__ */

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

r8776	r8787
32	32
33	33	namespace orxonox
34		{
35		~~namespace test~~
36	34	{
37	35	OutputListener::OutputListener()
…	…
77	75	}
78	76	}
79		}

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

r8774	r8787
38	38	namespace orxonox
39	39	{
40		~~namespace test~~
41		{
42	40	class _UtilExport OutputListener
43	41	{
…	…
72	70	};
73	71	}
74		}
75	72
76	73	#endif /* _OutputListener_H__ */

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

r8780	r8787
34	34
35	35	namespace orxonox
36		{
37		~~namespace test~~
38	36	{
39	37	OutputManager::OutputManager()
…	…
203	201	}
204	202	}
205		}

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

-                      r8776
+                      r8787
 #include <vector>
 #include <boost/bimap.hpp>
 …
 namespace orxonox
+{
-namespace test
+{
-    class OutputListener;
     class _UtilExport OutputManager
+    {
 …
     };
+}
+}
 #endif /* _OutputManager_H__ */

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

r8779	r8787
33	33	namespace orxonox
34	34	{
35		~~namespace test~~
36		{
37	35	OutputStream::OutputStream()
38	36	{
…	…
56	54	}
57	55	}
58		}

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

-                      r8779
+                      r8787
 namespace orxonox
+{
-namespace test
+{
     class OutputStream : public std::ostringstream
 …
     };
+}
+}
 #endif /* _OutputStream_H__ */

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 8787 for code/branches/output/src

Legend:

Download in other formats: