Changeset 2513 for code/branches/presentation/src

Timestamp:

Dec 18, 2008, 11:28:50 AM (16 years ago)

Author:

rgrieder

Message:

Fixed a bug in Timer.h: Include of Executor was missing, but when using forward declarations, you can still cast to base classes if you use a brute force C-style cast.
In this case this would not have mattered (simple derivation), but C-style casts with pointers are dangerous.

Location:

code/branches/presentation/src

Files:

• core/Iterator.h (modified) (1 diff)
• orxonox/tools/Timer.h (modified) (2 diffs)

code/branches/presentation/src/core/Iterator.h

@@ -96 +96 @@
             inline Iterator(ObjectListElement<O>* element)
             {
-                this->element_ = (element) ? static_cast<ObjectListBaseElement*<(element) : 0;
+                this->element_ = (element) ? static_cast<ObjectListBaseElement*>(element) : 0;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->iterator_ = this->list_->registerIterator(this);

code/branches/presentation/src/orxonox/tools/Timer.h

@@ -62 +62 @@
 
 #include "OrxonoxPrereqs.h"
+#include "core/Executor.h"
 #include "core/OrxonoxClass.h"
 #include "gamestates/GSRoot.h"
@@ -198 +199 @@
                 this->setInterval(interval);
                 this->bLoop_ = bLoop;
-                this->executor_ = static_cast<Executor*>(executor);
+                this->executor_ = executor;
                 this->bActive_ = true;