Changeset 10512 for code/branches/core7/src/libraries/core/CoreIncludes.h

Timestamp:

May 30, 2015, 10:59:13 PM (10 years ago)

Author:

landauf

Message:

fixed issue: Class(T) may not be allowed in StaticallyInitializedIdentifier::load() because T may not yet be initialized.
now the inheritance is resolved in Identifier::finishInitialization()

File:

• code/branches/core7/src/libraries/core/CoreIncludes.h (modified) (3 diffs)

code/branches/core7/src/libraries/core/CoreIncludes.h

@@ -218 +218 @@
     class _CoreExport StaticallyInitializedIdentifier : public StaticallyInitializedInstance
     {
-        struct InheritsFrom
+        template <class T>
+        struct InheritsFromClass : public Identifier::InheritsFrom
         {
-            virtual ~InheritsFrom() {}
-            virtual Identifier* getParent() = 0;
-        };
-
-        template <class T>
-        struct InheritsFromClass : public InheritsFrom
-        {
-            virtual Identifier* getParent() { return Class(T); }
+            virtual Identifier* getParent() const { return Class(T); }
         };
 
         public:
             StaticallyInitializedIdentifier(Identifier* identifier) : identifier_(identifier) {}
-            ~StaticallyInitializedIdentifier()
-            {
-                for (size_t i = 0; i < this->parents_.size(); ++i)
-                    delete parents_[i];
-            }
 
             virtual void load()
             {
                 IdentifierManager::getInstance().addIdentifier(this->identifier_);
-                for (size_t i = 0; i < this->parents_.size(); ++i)
-                    this->identifier_->inheritsFrom(this->parents_[i]->getParent());
             }
 
@@ -255 +242 @@
             template <class T>
             inline StaticallyInitializedIdentifier& inheritsFrom()
-                { this->parents_.push_back(new InheritsFromClass<T>()); return *this; }
+                { this->identifier_->inheritsFrom(new InheritsFromClass<T>()); return *this; }
 
             inline StaticallyInitializedIdentifier& virtualBase()
@@ -262 +249 @@
         private:
             Identifier* identifier_;
-            std::vector<InheritsFrom*> parents_;
     };