Changeset 677 for code/branches/FICN/src/orxonox/core/Identifier.h

Timestamp:

Dec 23, 2007, 7:19:07 PM (16 years ago)

Author:

landauf

Message:

changed \n to std::endl

File:

• code/branches/FICN/src/orxonox/core/Identifier.h (modified) (8 diffs)

code/branches/FICN/src/orxonox/core/Identifier.h

@@ -117 +117 @@
             {
                 hierarchyCreatingCounter_s++;
-                COUT(4) << "*** Increased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << "\n";
+                COUT(4) << "*** Increased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << std::endl;
             }
 
@@ -126 +126 @@
             {
                 hierarchyCreatingCounter_s--;
-                COUT(4) << "*** Decreased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << "\n";
+                COUT(4) << "*** Decreased Hierarchy-Creating-Counter to " << hierarchyCreatingCounter_s << std::endl;
             }
 
@@ -201 +201 @@
     ClassIdentifier<T>* ClassIdentifier<T>::registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass)
     {
-        COUT(4) << "*** Register Class in " << name << "-Singleton.\n";
+        COUT(4) << "*** Register Class in " << name << "-Singleton." << std::endl;
 
         // It's a singleton, so maybe we have to create it first
         if (!pointer_s)
         {
-            COUT(4) << "*** Register Class in " << name << "-Singleton -> Create Singleton.\n";
+            COUT(4) << "*** Register Class in " << name << "-Singleton -> Create Singleton." << std::endl;
             pointer_s = new ClassIdentifier();
         }
@@ -214 +214 @@
         {
             // If no: We have to store the informations and initialize the Identifier
-
-            COUT(4) << "*** Register Class in " << name << "-Singleton -> Initialize Singleton.\n";
+            COUT(4) << "*** Register Class in " << name << "-Singleton -> Initialize Singleton." << std::endl;
             pointer_s->name_ = name;
-//            Factory::add(name, pointer_s); // Add the Identifier to the Factory
-
             if (bRootClass)
                 pointer_s->initialize(NULL); // If a class is derived from two interfaces, the second interface might think it's derived from the first because of the order of constructor-calls. Thats why we set parents to zero in that case.
@@ -236 +233 @@
         if (!pointer_s)
         {
-            COUT(4) << "*** Create Singleton.\n";
+            COUT(4) << "*** Create Singleton." << std::endl;
             pointer_s = new ClassIdentifier();
         }
@@ -250 +247 @@
     void ClassIdentifier<T>::addObject(T* object)
     {
-        COUT(4) << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list.\n";
+        COUT(4) << "*** Added object to " << ClassIdentifier<T>::getIdentifier()->getName() << "-list." << std::endl;
         object->getMetaList().add(ClassIdentifier<T>::getIdentifier()->objects_, ClassIdentifier<T>::getIdentifier()->objects_->add(object));
     }
@@ -285 +282 @@
                 if (!identifier->isA(ClassIdentifier<T>::getIdentifier()))
                 {
-                    COUT(1) << "Error: Class " << identifier->getName() << " is not a " << ClassIdentifier<T>::getIdentifier()->getName() << "!\n";
-                    COUT(1) << "Error: SubclassIdentifier<" << ClassIdentifier<T>::getIdentifier()->getName() << "> = Class(" << identifier->getName() << ") is forbidden.\n";
-                    COUT(1) << "Aborting...\n";
+                    COUT(1) << "Error: Class " << identifier->getName() << " is not a " << ClassIdentifier<T>::getIdentifier()->getName() << "!" << std::endl;
+                    COUT(1) << "Error: SubclassIdentifier<" << ClassIdentifier<T>::getIdentifier()->getName() << "> = Class(" << identifier->getName() << ") is forbidden." << std::endl;
+                    COUT(1) << "Aborting..." << std::endl;
                     abort();
                 }
@@ -331 +328 @@
                     if (this->identifier_)
                     {
-                        COUT(1) << "Error: Class " << this->identifier_->getName() << " is not a " << ClassIdentifier<T>::getIdentifier()->getName() << "!\n";
-                        COUT(1) << "Error: Couldn't fabricate a new Object.\n";
-                        COUT(1) << "Aborting...\n";
+                        COUT(1) << "Error: Class " << this->identifier_->getName() << " is not a " << ClassIdentifier<T>::getIdentifier()->getName() << "!" << std::endl;
+                        COUT(1) << "Error: Couldn't fabricate a new Object." << std::endl;
+                        COUT(1) << "Aborting..." << std::endl;
                     }
                     else
                     {
-                        COUT(1) << "Error: Couldn't fabricate a new Object - Identifier is undefined.\n";
-                        COUT(1) << "Aborting...\n";
+                        COUT(1) << "Error: Couldn't fabricate a new Object - Identifier is undefined." << std::endl;
+                        COUT(1) << "Aborting..." << std::endl;
                     }