[Orxonox-commit 5713] r10373 - code/branches/core7/src/libraries/core/class

landauf at orxonox.net landauf at orxonox.net
Sat Apr 18 13:09:34 CEST 2015


Author: landauf
Date: 2015-04-18 13:09:33 +0200 (Sat, 18 Apr 2015)
New Revision: 10373

Modified:
   code/branches/core7/src/libraries/core/class/Identifier.h
Log:
detail (re-ordered functions)

Modified: code/branches/core7/src/libraries/core/class/Identifier.h
===================================================================
--- code/branches/core7/src/libraries/core/class/Identifier.h	2015-04-18 11:07:08 UTC (rev 10372)
+++ code/branches/core7/src/libraries/core/class/Identifier.h	2015-04-18 11:09:33 UTC (rev 10373)
@@ -157,14 +157,15 @@
             bool isParentOf(const Identifier* identifier) const;
             bool isDirectParentOf(const Identifier* identifier) const;
 
+            /// Returns the direct parents of the class the Identifier belongs to.
+            inline const std::list<const Identifier*>& getDirectParents() const { return this->directParents_; }
             /// Returns the parents of the class the Identifier belongs to.
             inline const std::list<const Identifier*>& getParents() const { return this->parents_; }
+
+            /// Returns the direct children the class the Identifier belongs to.
+            inline const std::set<const Identifier*>& getDirectChildren() const { return this->directChildren_; }
             /// Returns the children of the class the Identifier belongs to.
             inline const std::set<const Identifier*>& getChildren() const { return this->children_; }
-            /// Returns the direct parents of the class the Identifier belongs to.
-            inline const std::list<const Identifier*>& getDirectParents() const { return this->directParents_; }
-            /// Returns the direct children the class the Identifier belongs to.
-            inline const std::set<const Identifier*>& getDirectChildren() const { return this->directChildren_; }
 
 
             /////////////////////////
@@ -208,11 +209,11 @@
             virtual void createSuperFunctionCaller() const = 0;
 
         private:
+            std::list<const Identifier*> directParents_;                    //!< The direct parents of the class the Identifier belongs to (sorted by their order of initialization)
             std::list<const Identifier*> parents_;                          //!< The parents of the class the Identifier belongs to (sorted by their order of initialization)
-            std::set<const Identifier*> children_;                         //!< The children of the class the Identifier belongs to
 
-            std::list<const Identifier*> directParents_;                    //!< The direct parents of the class the Identifier belongs to (sorted by their order of initialization)
             std::set<const Identifier*> directChildren_;                   //!< The direct children of the class the Identifier belongs to
+            std::set<const Identifier*> children_;                         //!< The children of the class the Identifier belongs to
 
             bool bInitialized_;                                            //!< Is true if the Identifier was completely initialized
             bool bLoadable_;                                               //!< False = it's not permitted to load the object through XML




More information about the Orxonox-commit mailing list