Changeset 2531 for code/branches/bugger/src/core/Identifier.h

Timestamp:

Dec 23, 2008, 11:09:55 PM (15 years ago)

Author:

rgrieder

Message:

Merged revision 2371 to bugger branch.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/core/Identifier.h (modified) (3 diffs)

code/branches/bugger/src/core/Identifier.h

@@ -68 +68 @@
 #include "Super.h"
 #include "Functor.h"
+#include "util/Integers.h"
 #include "util/Debug.h"
 #include "util/String.h"
@@ -230 +231 @@
 
             /** @brief Returns the network ID to identify a class through the network. @return the network ID */
-            inline const unsigned int getNetworkID() const { return this->classID_; }
+            inline const uint32_t getNetworkID() const { return this->classID_; }
 
             /** @brief Sets the network ID to a new value. @param id The new value */
-            void setNetworkID(unsigned int id);
+            void setNetworkID(uint32_t id);
 
             void addConfigValueContainer(const std::string& varname, ConfigValueContainer* container);
@@ -317 +318 @@
             BaseFactory* factory_;                                         //!< The Factory, able to create new objects of the given class (if available)
             static int hierarchyCreatingCounter_s;                         //!< Bigger than zero if at least one Identifier stores its parents (its an int instead of a bool to avoid conflicts with multithreading)
-            unsigned int classID_;                                         //!< The network ID to identify a class through the network
+            uint32_t classID_;                                             //!< The network ID to identify a class through the network
 
             bool bHasConfigValues_;                                        //!< True if this class has at least one assigned config value