Changeset 7212 for code/branches/consolecommands3/src/libraries/util

Timestamp:

Aug 24, 2010, 4:56:37 PM (14 years ago)

Author:

landauf

Message:

re-implemented Functor - without macros!

Location:

code/branches/consolecommands3/src/libraries/util

Files:

• MultiType.h (modified) (1 diff)
• SharedPtr.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/util/MultiType.h

@@ -493 +493 @@
     template <> inline bool MultiType::isType<orxonox::Degree>()      const { return (this->value_ && this->value_->type_ == MT_Type::Degree);           } /** @brief Returns true if the current type equals the given type. */
 
+    template <> inline bool MultiType::convert<void>()                 { this->reset(); return true; } /** @brief Deletes the content, type becomes MT_Type::Null. */
+
     // Specialization to avoid ambiguities with the conversion operator
     template <> inline bool MultiType::convert<std::string>()          { return this->setValue<std::string>         (this->operator std::string());          } /** @brief Converts the current value to the given type. */

code/branches/consolecommands3/src/libraries/util/SharedPtr.h

@@ -137 +137 @@
             }
 
+            inline T* get() const
+            {
+                return this->pointer_;
+            }
+
             inline operator bool() const
             {