- Timestamp:
- May 24, 2015, 11:19:15 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core7/src/libraries/core/singleton/ScopedSingletonWrapper.h
r10459 r10460 57 57 @brief Base class of ClassScopedSingletonWrapper. 58 58 */ 59 class _CoreExport ScopedSingletonWrapper 59 class _CoreExport ScopedSingletonWrapper : public ScopeListener 60 60 { 61 61 public: 62 62 /// Constructor: Initializes all the values 63 63 ScopedSingletonWrapper(const std::string& className, ScopeID::Value scope) 64 : className_(className)65 , scope_(scope)64 : ScopeListener(scope) 65 , className_(className) 66 66 { } 67 67 virtual ~ScopedSingletonWrapper() { } … … 69 69 protected: 70 70 const std::string className_; ///< The name of the scoped singleton class that is managed by this object 71 const ScopeID::Value scope_; ///< The scope of the singleton that is managed by this object72 71 }; 73 72 … … 89 88 */ 90 89 template <class T, ScopeID::Value scope, bool allowedToFail> 91 class ClassScopedSingletonWrapper : public ScopedSingletonWrapper , public ScopeListener90 class ClassScopedSingletonWrapper : public ScopedSingletonWrapper 92 91 { 93 92 public: … … 95 94 ClassScopedSingletonWrapper(const std::string& className) 96 95 : ScopedSingletonWrapper(className, scope) 97 , ScopeListener(scope)98 96 , singletonPtr_(NULL) 99 97 { … … 145 143 */ 146 144 template <class T, ScopeID::Value scope> 147 class ClassScopedSingletonWrapper<T, scope, true> : public ScopedSingletonWrapper , public ScopeListener145 class ClassScopedSingletonWrapper<T, scope, true> : public ScopedSingletonWrapper 148 146 { 149 147 public: … … 151 149 ClassScopedSingletonWrapper(const std::string& className) 152 150 : ScopedSingletonWrapper(className, scope) 153 , ScopeListener(scope)154 151 , singletonPtr_(NULL) 155 152 {
Note: See TracChangeset
for help on using the changeset viewer.