Changeset 10555 for code/branches/core7/src/orxonox/Scene.cc

Timestamp:

Aug 29, 2015, 5:35:59 PM (9 years ago)

Author:

landauf

Message:

renamed SmartPtr to StrongPtr (now we have weak and strong pointers)

File:

• code/branches/core7/src/orxonox/Scene.cc (modified) (2 diffs)

code/branches/core7/src/orxonox/Scene.cc

@@ -62 +62 @@
         RegisterObject(Scene);
 
-        this->setScene(SmartPtr<Scene>(this, false), OBJECTID_UNKNOWN);
+        this->setScene(StrongPtr<Scene>(this, false), OBJECTID_UNKNOWN);
         this->bShadows_ = true;
         this->bDebugDrawPhysics_ = false;
@@ -366 +366 @@
     {
         // get the WorldEntity pointers
-        SmartPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
-        SmartPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
+        StrongPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
+        StrongPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
 
         // get the CollisionShape pointers