Changeset 10768 for code/branches/cpp11_v2/src/libraries/core/class

Timestamp:

Nov 6, 2015, 10:54:34 PM (9 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/libraries/core/class

Files:

• Identifiable.cc (modified) (1 diff)
• Identifier.cc (modified) (4 diffs)
• Identifier.h (modified) (4 diffs)
• IdentifierManager.cc (modified) (5 diffs)
• SubclassIdentifier.h (modified) (1 diff)
• Super.h (modified) (4 diffs)

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

@@ -48 +48 @@
     Identifiable::Identifiable()
     {
-        this->identifier_ = 0;
+        this->identifier_ = nullptr;
         this->objectPointers_.reserve(6); // Optimisation
 

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

@@ -117 +117 @@
             orxout(user_error) << "Aborting..." << endl;
             abort();
-            return 0;
+            return nullptr;
         }
     }
@@ -393 +393 @@
             return it->second;
         else
-            return 0;
+            return nullptr;
     }
 
@@ -407 +407 @@
             return it->second;
         else
-            return 0;
+            return nullptr;
     }
 
@@ -438 +438 @@
             return it->second;
         else
-            return 0;
+            return nullptr;
     }
 

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

@@ -56 +56 @@
     object->getIdentifier()->getName();                                         // returns "MyClass"
 
-    Identifiable* other = object->getIdentifier()->fabricate(0);                // fabricates a new instance of MyClass
+    Identifiable* other = object->getIdentifier()->fabricate(nullptr);                // fabricates a new instance of MyClass
 
 
@@ -137 +137 @@
 
             /// Returns true if the Identifier has a Factory.
-            inline bool hasFactory() const { return (this->factory_ != 0); }
+            inline bool hasFactory() const { return (this->factory_ != nullptr); }
 
             Identifiable* fabricate(Context* context);
@@ -297 +297 @@
 
             virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const
-                { return dynamic_cast<T*>(object) != 0; }
+                { return dynamic_cast<T*>(object) != nullptr; }
 
             virtual void destroyObjects();
@@ -408 +408 @@
     void ClassIdentifier<T>::destroyObjects()
     {
-        this->destroyObjects((T*)0);
+        this->destroyObjects((T*)nullptr);
     }
 

code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    IdentifierManager* IdentifierManager::singletonPtr_s = 0;
+    IdentifierManager* IdentifierManager::singletonPtr_s = nullptr;
 
     IdentifierManager::IdentifierManager()
@@ -221 +221 @@
             return it->second;
         else
-            return 0;
+            return nullptr;
     }
 
@@ -235 +235 @@
             return it->second;
         else
-            return 0;
+            return nullptr;
     }
 
@@ -249 +249 @@
             return it->second;
         else
-            return 0;
+            return nullptr;
     }
 
@@ -263 +263 @@
             if ((*it)->getTypeInfo() == typeInfo)
                 return (*it);
-        return 0;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/libraries/core/class/SubclassIdentifier.h

@@ -189 +189 @@
                     orxout(user_error) << "Aborting..." << endl;
                     abort();
-                    return 0;
+                    return nullptr;
                 }
             }

code/branches/cpp11_v2/src/libraries/core/class/Super.h

@@ -94 +94 @@
             static void superCheck() \
             { \
-                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0)); \
+                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(nullptr)); \
                 SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck(); \
             } \
@@ -108 +108 @@
                     { \
                         delete ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_; \
-                        ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = 0; \
+                        ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = nullptr; \
                         ((ClassIdentifier<T>*)(*it))->bSuperFunctionCaller_##functionname##_isFallback_ = false; \
                     } \
@@ -154 +154 @@
                 // This call to the apply-function is the whole check. By calling the function with
                 // a T* pointer, the right function get's called.
-                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0));
+                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(nullptr));
 
                 // Go go the superCheck for of next super-function (functionnumber + 1)
@@ -178 +178 @@
                         // Delete the fallback caller an prepare to get a real caller
                         delete ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_;
-                        ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = 0;
+                        ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = nullptr;
                         ((ClassIdentifier<T>*)(*it))->bSuperFunctionCaller_##functionname##_isFallback_ = false;
                     }