Changeset 9535 for code/branches/testing/src

Timestamp:

Mar 4, 2013, 10:24:30 PM (11 years ago)

Author:

landauf

Message:

more tests

Location:

code/branches/testing/src/libraries/util/output

Files:

• ConsoleWriter.h (modified) (2 diffs)
• LogWriter.h (modified) (2 diffs)
• MemoryWriter.h (modified) (2 diffs)
• OutputDefinitions.h (modified) (1 diff)
• OutputManager.h (modified) (1 diff)

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

@@ -50 +50 @@
     {
         public:
+            ConsoleWriter();
+            ConsoleWriter(const ConsoleWriter&);
+            virtual ~ConsoleWriter();
+
             static ConsoleWriter& getInstance();
 
@@ -59 +63 @@
 
         private:
-            ConsoleWriter();
-            ConsoleWriter(const ConsoleWriter&);
-            virtual ~ConsoleWriter();
-
             bool bEnabled_; ///< If false, the instance will not write output to the console.
     };

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

@@ -57 +57 @@
     {
         public:
+            LogWriter();
+            LogWriter(const LogWriter&);
+            virtual ~LogWriter();
+
             static LogWriter& getInstance();
 
@@ -65 +69 @@
 
         private:
-            LogWriter();
-            LogWriter(const LogWriter&);
-            virtual ~LogWriter();
-
             void openFile();
             void closeFile();

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

@@ -67 +67 @@
 
         public:
+            MemoryWriter();
+            MemoryWriter(const MemoryWriter&);
+            virtual ~MemoryWriter();
+
             static MemoryWriter& getInstance();
 
@@ -76 +80 @@
 
         private:
-            MemoryWriter();
-            MemoryWriter(const MemoryWriter&);
-            virtual ~MemoryWriter();
-
             std::vector<Message> messages_; ///< Stores all output messages from the creation of this instance until disable() is called.
     };

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

@@ -105 +105 @@
         OutputContextSubID sub_id;  ///< The id of the sub-context (or context::no_subcontext if this container doesn't define a sub-context)
         std::string name;           ///< The name of this context
+
+        inline bool operator==(const OutputContextContainer& other) const
+        {
+            return this->mask == other.mask && this->sub_id == other.sub_id && this->name == other.name;
+        }
     };
 

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

@@ -102 +102 @@
             std::string getDefaultPrefix(OutputLevel level, const OutputContextContainer& context) const;
 
-        protected:
             inline const std::vector<OutputListener*>& getListeners() const
                 { return this->listeners_; }