Changeset 9550 for code/trunk/src/libraries/util/output/ConsoleWriter.cc
- Timestamp:
- Mar 12, 2013, 11:13:03 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/testing (added) merged: 9015,9017,9020-9022,9025-9026,9047,9076-9078,9114-9115,9221-9226,9356,9473-9480,9524,9529-9531,9533-9545,9547-9549
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/util/output/ConsoleWriter.cc
r9348 r9550 34 34 #include "ConsoleWriter.h" 35 35 36 #include <iostream>37 36 38 37 #include "OutputManager.h" … … 48 47 After creation, the instance is enabled. 49 48 */ 50 ConsoleWriter::ConsoleWriter( ) : BaseWriter("Console")49 ConsoleWriter::ConsoleWriter(std::ostream& outputStream) : BaseWriter("Console"), outputStream_(outputStream) 51 50 { 52 51 #ifdef ORXONOX_RELEASE … … 66 65 67 66 /** 68 @brief Returns the only existing instance of this class.69 */70 /*static*/ ConsoleWriter& ConsoleWriter::getInstance()71 {72 static ConsoleWriter instance;73 return instance;74 }75 76 /**77 67 @brief Inherited function from BaseWriter, writes output to the console using std::cout. 78 68 */ 79 69 void ConsoleWriter::printLine(const std::string& line, OutputLevel) 80 70 { 81 std::cout<< line << std::endl;71 this->outputStream_ << line << std::endl; 82 72 } 83 73
Note: See TracChangeset
for help on using the changeset viewer.