Changeset 7268 for code/trunk/src/libraries/core/SmartPtr.h

Timestamp:

Aug 30, 2010, 7:34:07 PM (15 years ago)

Author:

rgrieder

Message:

operator=() should not return constant references.

File:

• code/trunk/src/libraries/core/SmartPtr.h (modified) (7 diffs)

code/trunk/src/libraries/core/SmartPtr.h

@@ -36 +36 @@
 #include <cassert>
 
+#include "Identifier.h"
 #include "OrxonoxClass.h"
 #include "WeakPtr.h"
@@ -85 +86 @@
             }
 
-            inline const SmartPtr& operator=(int)
+            inline SmartPtr& operator=(int)
             {
                 SmartPtr(0).swap(*this);
@@ -91 +92 @@
             }
 
-            inline const SmartPtr& operator=(T* pointer)
+            inline SmartPtr& operator=(T* pointer)
             {
                 SmartPtr(pointer).swap(*this);
@@ -97 +98 @@
             }
 
-            inline const SmartPtr& operator=(const SmartPtr& other)
+            inline SmartPtr& operator=(const SmartPtr& other)
             {
                 SmartPtr(other).swap(*this);
@@ -104 +105 @@
 
             template <class O>
-            inline const SmartPtr& operator=(const SmartPtr<O>& other)
+            inline SmartPtr& operator=(const SmartPtr<O>& other)
             {
                 SmartPtr(other).swap(*this);
@@ -111 +112 @@
 
             template <class O>
-            inline const SmartPtr& operator=(const WeakPtr<O>& other)
+            inline SmartPtr& operator=(const WeakPtr<O>& other)
             {
                 SmartPtr(other).swap(*this);
@@ -194 +195 @@
     SmartPtr<T> dynamic_pointer_cast(const SmartPtr<U>& p)
     {
-        return dynamic_cast<T*>(p.get());
+        return orxonox_cast<T*>(p.get());
     }
 }