Changeset 10374 for code/branches

Timestamp:

Apr 19, 2015, 10:04:35 PM (10 years ago)

Author:

landauf

Message:

added flag to define if a class should be used as a virtual parent (i.e. inherit with 'virtual public <classname>')

Location:

code/branches/core7/src/libraries/core

Files:

• CoreIncludes.h (modified) (1 diff)
• class/Identifiable.cc (modified) (1 diff)
• class/Identifier.cc (modified) (1 diff)
• class/Identifier.h (modified) (2 diffs)
• class/OrxonoxInterface.cc (modified) (1 diff)
• config/Configurable.cc (modified) (1 diff)
• object/Listable.cc (modified) (1 diff)

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

@@ -255 +255 @@
                 { this->parents_.push_back(new InheritsFromClass<T>()); return *this; }
 
+            inline StaticallyInitializedIdentifier& virtualBase()
+                { this->identifier_->setVirtualBase(true); return *this; }
+
         private:
             Identifier* identifier_;

code/branches/core7/src/libraries/core/class/Identifiable.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    RegisterClassNoArgs(Identifiable);
+    RegisterClassNoArgs(Identifiable).virtualBase();
 
     /**

code/branches/core7/src/libraries/core/class/Identifier.cc

@@ -56 +56 @@
         this->bInitialized_ = false;
         this->bLoadable_ = false;
+        this->bIsVirtualBase_ = false;
 
         this->bHasConfigValues_ = false;

code/branches/core7/src/libraries/core/class/Identifier.h

@@ -138 +138 @@
             /// Set the class to be loadable through XML or not.
             inline void setLoadable(bool bLoadable) { this->bLoadable_ = bLoadable; }
+
+            /// Returns true if child classes should inherit virtually from this class.
+            inline bool isVirtualBase() const { return this->bIsVirtualBase_; }
+            /// Defines if child classes should inherit virtually from this class.
+            inline void setVirtualBase(bool bIsVirtualBase) { this->bIsVirtualBase_ = bIsVirtualBase; }
 
             /// Returns true if the Identifier was completely initialized.
@@ -218 +223 @@
             bool bInitialized_;                                            //!< Is true if the Identifier was completely initialized
             bool bLoadable_;                                               //!< False = it's not permitted to load the object through XML
+            bool bIsVirtualBase_;                                          //!< If true, it is recommended to inherit virtually from this class. This changes the order of initialization of child classes, thus this information is necessary to check the class hierarchy.
             std::string name_;                                             //!< The name of the class the Identifier belongs to
             Factory* factory_;                                             //!< The Factory, able to create new objects of the given class (if available)

code/branches/core7/src/libraries/core/class/OrxonoxInterface.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    RegisterClassNoArgs(OrxonoxInterface);
+    RegisterClassNoArgs(OrxonoxInterface).virtualBase();
 
     OrxonoxInterface::OrxonoxInterface()

code/branches/core7/src/libraries/core/config/Configurable.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    RegisterClassNoArgs(Configurable);
+    RegisterClassNoArgs(Configurable).virtualBase();
 
     Configurable::Configurable()

code/branches/core7/src/libraries/core/object/Listable.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    RegisterClass(Listable);
+    RegisterClass(Listable).virtualBase();
 
     /**