Changeset 9641 for code/branches/core6/src/libraries/core/class/IdentifierManager.h

Timestamp:

Aug 11, 2013, 9:33:11 PM (12 years ago)

Author:

landauf

Message:

removed mutual friend declarations between Identifier and IdentifierManager

File:

• code/branches/core6/src/libraries/core/class/IdentifierManager.h (modified) (3 diffs)

code/branches/core6/src/libraries/core/class/IdentifierManager.h

@@ -44 +44 @@
     class _CoreExport IdentifierManager
     {
-        friend class Identifier;
-        template <class T> friend class ClassIdentifier;
-
         public:
             static IdentifierManager& getInstance();
@@ -53 +50 @@
             ////// Class Hierarchy //////
             /////////////////////////////
+            Identifier* getIdentifierSingleton(const std::string& name, Identifier* proposal);
+
+            unsigned int getUniqueClassId()
+                { return this->classIDCounter_s++; }
+
+            void registerIdentifier(Identifier* identifier);
+
             void createClassHierarchy();
 
@@ -101 +105 @@
                 { return this->identifierByNetworkId_.end(); }
 
-        protected:
-            Identifier* getIdentifierSingleton(const std::string& name, Identifier* proposal);
-
         private:
             IdentifierManager();