- Timestamp:
- Jan 10, 2016, 1:54:11 PM (9 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/libraries/util/output/OutputManager.cc
r9550 r11054 41 41 #include "util/Output.h" 42 42 #include "util/StringUtils.h" 43 #include "util/SharedPtr.h"44 43 45 44 namespace orxonox … … 57 56 58 57 this->isInitialized_ = false; 59 this->memoryWriterInstance_ = 0;60 this->consoleWriterInstance_ = 0;61 this->logWriterInstance_ = 0;58 this->memoryWriterInstance_ = nullptr; 59 this->consoleWriterInstance_ = nullptr; 60 this->logWriterInstance_ = nullptr; 62 61 63 62 // register 'undefined' context in order to give it always the first context-ID … … 81 80 } 82 81 83 /*static*/ SharedPtr<OutputManager>& OutputManager::Testing::getInstancePointer()84 { 85 static SharedPtr<OutputManager> instance(new OutputManager());82 /*static*/ std::shared_ptr<OutputManager>& OutputManager::Testing::getInstancePointer() 83 { 84 static std::shared_ptr<OutputManager> instance(new OutputManager()); 86 85 return instance; 87 86 } … … 132 131 vectorize(message, '\n', &lines); 133 132 134 for ( size_t i = 0; i < this->listeners_.size(); ++i)135 this->listeners_[i]->unfilteredOutput(level, context, lines);133 for (OutputListener* listener : this->listeners_) 134 listener->unfilteredOutput(level, context, lines); 136 135 } 137 136 … … 179 178 { 180 179 int mask = 0; 181 for ( size_t i = 0; i < this->listeners_.size(); ++i)182 mask |= this->listeners_[i]->getLevelMask();180 for (OutputListener* listener : this->listeners_) 181 mask |= listener->getLevelMask(); 183 182 this->combinedLevelMask_ = static_cast<OutputLevel>(mask); 184 183 } … … 190 189 { 191 190 int mask = 0; 192 for ( size_t i = 0; i < this->listeners_.size(); ++i)193 mask |= this->listeners_[i]->getAdditionalContextsLevelMask();191 for (OutputListener* listener : this->listeners_) 192 mask |= listener->getAdditionalContextsLevelMask(); 194 193 this->combinedAdditionalContextsLevelMask_ = static_cast<OutputLevel>(mask); 195 194 } … … 201 200 { 202 201 this->combinedAdditionalContextsMask_ = 0; 203 for ( size_t i = 0; i < this->listeners_.size(); ++i)204 this->combinedAdditionalContextsMask_ |= this->listeners_[i]->getAdditionalContextsMask();202 for (OutputListener* listener : this->listeners_) 203 this->combinedAdditionalContextsMask_ |= listener->getAdditionalContextsMask(); 205 204 } 206 205
Note: See TracChangeset
for help on using the changeset viewer.