Changeset 696 for code/branches/FICN/src/orxonox
- Timestamp:
- Dec 27, 2007, 4:59:55 AM (17 years ago)
- Location:
- code/branches/FICN/src/orxonox/core
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/src/orxonox/core/Identifier.cc
r691 r696 40 40 int Identifier::hierarchyCreatingCounter_s = 0; // Set the static member variable hierarchyCreatingCounter_s to zero 41 41 unsigned int Identifier::classIDcounter_s = 0; // Set the static member variable classIDcounter_s to zero 42 std::map<std::string, Identifier*> Identifier::identifierMap_s;43 42 44 43 /** … … 115 114 116 115 /** 116 @returns a reference to the Identifier map, containing all Identifiers. 117 */ 118 std::map<std::string, Identifier*>& Identifier::getIdentifierMap() 119 { 120 static std::map<std::string, Identifier*> identifierMapStaticReference = std::map<std::string, Identifier*>(); 121 return identifierMapStaticReference; 122 } 123 124 /** 117 125 @returns true, if the Identifier is at least of the given type. 118 126 @param identifier The identifier to compare with -
code/branches/FICN/src/orxonox/core/Identifier.h
r694 r696 137 137 { this->configValues_[varname] = container; } 138 138 139 std::map<std::string, Identifier*>& getIdentifierMap(); 140 139 141 private: 140 142 Identifier(); … … 172 174 unsigned int classID_; //!< The network ID to identify a class through the network 173 175 std::map<std::string, ConfigValueContainer*> configValues_; //!< A map to link the string of configurable variables with their ConfigValueContainer 174 static std::map<std::string, Identifier*> identifierMap_s; //!< A map, containing all existing ClassIdentifiers175 176 }; 176 177 … … 282 283 { 283 284 this->name_ = name; 284 this-> identifierMap_s[name] = this;285 this->getIdentifierMap().insert(std::pair<std::string, Identifier*>(name, this)); 285 286 this->bSetName_ = true; 286 287 }
Note: See TracChangeset
for help on using the changeset viewer.