Changeset 11071 for code/trunk/src/libraries/util/output/OutputManager.h
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/util/output/OutputManager.h
r9550 r11071 41 41 #include <vector> 42 42 #include <map> 43 #include <memory> 43 44 44 45 #include "OutputDefinitions.h" … … 66 67 public: 67 68 OutputManager(); 68 OutputManager(const OutputManager&);69 69 virtual ~OutputManager(); 70 70 … … 81 81 virtual void unregisterListener(OutputListener* listener); 82 82 83 virtual void updatedLevelMask(const OutputListener* listener) 83 virtual void updatedLevelMask(const OutputListener* listener) override 84 84 { this->updateCombinedLevelMask(); } 85 virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener) 85 virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener) override 86 86 { this->updateCombinedAdditionalContextsLevelMask(); } 87 virtual void updatedAdditionalContextsMask(const OutputListener* listener) 87 virtual void updatedAdditionalContextsMask(const OutputListener* listener) override 88 88 { this->updateCombinedAdditionalContextsMask(); } 89 89 … … 114 114 115 115 private: 116 // non-copyable: 117 OutputManager(const OutputManager&) = delete; 118 OutputManager& operator=(const OutputManager&) = delete; 119 116 120 void updateMasks(); 117 121 void updateCombinedLevelMask(); … … 137 141 struct _UtilExport Testing 138 142 { 139 static SharedPtr<OutputManager>& getInstancePointer();143 static std::shared_ptr<OutputManager>& getInstancePointer(); 140 144 }; 141 145 };
Note: See TracChangeset
for help on using the changeset viewer.