Changeset 7180

Timestamp:

Aug 18, 2010, 3:43:11 PM (14 years ago)

Author:

landauf

Message:

adjusted Functor to work with the changes introduced in r7177

File:

• code/branches/consolecommands3/src/libraries/core/Functor.h (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/Functor.h

@@ -185 +185 @@
             void setBaseObject(BaseObject* object)
             {
-                this->bConstObject_ = false;
                 this->object_ = dynamic_cast<T*>(object);
+                this->constObject_ = 0;
             }
 
             void setBaseObject(const BaseObject* object)
             {
-                this->bConstObject_ = true;
+                this->object_ = 0;
                 this->constObject_ = dynamic_cast<const T*>(object);
             }
@@ -197 +197 @@
             BaseObject* getBaseObject() const
             {
-                if (this->bConstObject_)
+                if (this->object_)
+                    return upcast<BaseObject*>(this->object_);
+                else
                     return const_cast<BaseObject*>(upcast<const BaseObject*>(this->constObject_));
+            }
+
+            void setRawObjectPointer(void* object)
+            {
+                this->object_ = (T*)object;
+                this->constObject_ = 0;
+            }
+
+            void* getRawObjectPointer() const
+            {
+                if (this->object_)
+                    return (void*)this->object_;
                 else
-                    return upcast<BaseObject*>(this->object_);
-            }
-
-            void setRawObjectPointer(void* object)
-            {
-                this->bConstObject_ = false;
-                this->object_ = (T*)object;
-            }
-
-            void* getRawObjectPointer() const
-            {
-                if (this->bConstObject_)
                     return (void*)this->constObject_;
-                else
-                    return (void*)this->object_;
             }