[Orxonox-commit 2473] r7180 - code/branches/consolecommands3/src/libraries/core

[landauf at orxonox.net]

Author: landauf
Date: 2010-08-18 15:43:11 +0200 (Wed, 18 Aug 2010)
New Revision: 7180

Modified:
   code/branches/consolecommands3/src/libraries/core/Functor.h
Log:
adjusted Functor to work with the changes introduced in r7177


Modified: code/branches/consolecommands3/src/libraries/core/Functor.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Functor.h	2010-08-18 13:39:01 UTC (rev 7179)
+++ code/branches/consolecommands3/src/libraries/core/Functor.h	2010-08-18 13:43:11 UTC (rev 7180)
@@ -184,36 +184,36 @@
 
             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);
             }
 
             BaseObject* getBaseObject() const
             {
-                if (this->bConstObject_)
+                if (this->object_)
+                    return upcast<BaseObject*>(this->object_);
+                else
                     return const_cast<BaseObject*>(upcast<const BaseObject*>(this->constObject_));
-                else
-                    return upcast<BaseObject*>(this->object_);
             }
 
             void setRawObjectPointer(void* object)
             {
-                this->bConstObject_ = false;
                 this->object_ = (T*)object;
+                this->constObject_ = 0;
             }
 
             void* getRawObjectPointer() const
             {
-                if (this->bConstObject_)
+                if (this->object_)
+                    return (void*)this->object_;
+                else
                     return (void*)this->constObject_;
-                else
-                    return (void*)this->object_;
             }
 
             typedef std::pair<T*, const T*> Objects;