Changeset 231 for code

Timestamp:

Nov 20, 2007, 10:42:34 PM (17 years ago)

Author:

landauf

Message:

added preprocessor-flag to change verbose mode of class-hierarchy and set it to false:

Identifier.h:
#define HIERARCHY_VERBOSE false

Location:

code/branches/objecthierarchie/src

Files:

• Identifier.cc (modified) (1 diff)
• Identifier.h (modified) (6 diffs)
• IdentifierIncludes.h (modified) (2 diffs)

code/branches/objecthierarchie/src/Identifier.cc

@@ -20 +20 @@
     void Identifier::initialize(IdentifierList* parents)
     {
+#if HIERARCHY_VERBOSE
         std::cout << "*** Initialize " << this->name_ << "-Singleton.\n";
+#endif
         if (parents)
         {

code/branches/objecthierarchie/src/Identifier.h

@@ -6 +6 @@
 #include "IdentifierList.h"
 #include "ObjectList.h"
-//#include "OrxonoxClass.h"
 #include "Factory.h"
 
-// DONE AND TESTED:
-// - build class hierarchy
-// - isA, isChildOf, ...
-// - insert into class-lists
-// - ClassIdentifier
-// - BaseIdentifier
-// - Factory
-
-// IN WORK:
-
-// TO DO:
-// - iterate through lists
+#define HIERARCHY_VERBOSE false
+
 
 namespace orxonox
@@ -63 +52 @@
             void initialize(IdentifierList* parents);
 
-            static void startCreatingHierarchy() { hierarchyCreatingCounter_s++; std::cout << "*** Increased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << "\n"; }
-            static void stopCreatingHierarchy() { hierarchyCreatingCounter_s--; std::cout << "*** Decreased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << "\n"; }
+            static void startCreatingHierarchy()
+            {
+                hierarchyCreatingCounter_s++;
+#if HIERARCHY_VERBOSE
+                std::cout << "*** Increased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << "\n";
+#endif
+            }
+
+            static void stopCreatingHierarchy()
+            {
+                hierarchyCreatingCounter_s--;
+#if HIERARCHY_VERBOSE
+                std::cout << "*** Decreased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << "\n";
+#endif
+            }
 
             IdentifierList directParents_;
@@ -144 +146 @@
     ClassIdentifier<T>* ClassIdentifier<T>::registerClass(IdentifierList* parents, std::string name, bool bRootClass, bool bIsAbstractClass)
     {
+#if HIERARCHY_VERBOSE
         std::cout << "*** Register Class in " << name << "-Singleton.\n";
+#endif
         if (!pointer_s)
         {
+#if HIERARCHY_VERBOSE
             std::cout << "*** Register Class in " << name << "-Singleton -> Create Singleton.\n";
+#endif
             if (parents || bRootClass)
             {
@@ -173 +179 @@
     ClassIdentifier<T>* ClassIdentifier<T>::getIdentifier()
     {
+#if HIERARCHY_VERBOSE
 //        std::cout << "*** Get Identifier.\n";
+#endif
         if (!pointer_s)
         {
+#if HIERARCHY_VERBOSE
             std::cout << "*** Get Identifier -> Create Class\n";
+#endif
             Identifier::startCreatingHierarchy();
             T* temp = new T();
@@ -189 +199 @@
     void ClassIdentifier<T>::addObject(T* object)
     {
+#if HIERARCHY_VERBOSE
         std::cout << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list.\n";
+#endif
         ClassIdentifier<T>::getIdentifier()->objects_s.add(object);
     }
@@ -198 +210 @@
         bool bIterateForwards = !Identifier::isCreatingHierarchy();
 
+#if HIERARCHY_VERBOSE
         if (bIterateForwards)
             std::cout << "*** Removed object from " << this->name_ << "-list, iterating forwards.\n";
         else
             std::cout << "*** Removed object from " << this->name_ << "-list, iterating backwards.\n";
+#endif
 
         this->objects_s.remove(object, bIterateForwards);

code/branches/objecthierarchie/src/IdentifierIncludes.h

@@ -15 +15 @@
     ClassIdentifier<ClassName>::addObject(this)
 
+#if HIERARCHY_VERBOSE
 #define registerRootObject(ClassName) \
     std::cout << "*** Register Root-Object: " << #ClassName << "\n"; \
     internRegisterRootObject(ClassName, false)
+#else
+#define registerRootObject(ClassName) \
+    internRegisterRootObject(ClassName, false)
+#endif
 
+#if HIERARCHY_VERBOSE
 #define registerAbstractRootObject(ClassName) \
     std::cout << "*** Register abstract Root-Object: " << #ClassName << "\n"; \
     internRegisterRootObject(ClassName, true)
+#else
+#define registerAbstractRootObject(ClassName) \
+    internRegisterRootObject(ClassName, true)
+#endif
 
 #define internRegisterObject(ClassName, bAbstract) \
@@ -29 +39 @@
     ClassIdentifier<ClassName>::addObject(this)
 
+#if HIERARCHY_VERBOSE
 #define registerObject(ClassName) \
     std::cout << "*** Register Object: " << #ClassName << "\n"; \
     internRegisterObject(ClassName, false)
+#else
+#define registerObject(ClassName) \
+    internRegisterObject(ClassName, false)
+#endif
 
+#if HIERARCHY_VERBOSE
 #define registerAbstractObject(ClassName) \
     std::cout << "*** Register abstract Object: " << #ClassName << "\n"; \
     internRegisterObject(ClassName, true)
+#else
+#define registerAbstractObject(ClassName) \
+    internRegisterObject(ClassName, true)
+#endif
 
 #define unregisterObject() \