Changeset 7213

Timestamp:

Aug 24, 2010, 11:26:14 PM (14 years ago)

Author:

landauf

Message:

small changes in Functor, removed specialization for FunctorStatic (FunctorMember<void>) to gain cast-ability to FunctorPointer<F>

File:

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

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

@@ -34 +34 @@
 #include "core/CorePrereqs.h"
 
-#include "util/Convert.h"
 #include "util/Debug.h"
 #include "util/MultiType.h"
@@ -114 +113 @@
     };
 
+    namespace detail
+    {
+        template <class O>
+        struct FunctorTypeStatic
+        { enum { result = false }; };
+        template <>
+        struct FunctorTypeStatic<void>
+        { enum { result = true }; };
+    }
+
     template <class O>
     class FunctorMember : public Functor
@@ -124 +133 @@
             MultiType operator()(const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null)
             {
-                if (this->object_)
+                if (detail::FunctorTypeStatic<O>::result || this->object_)
                     return (*this)(this->object_, param1, param2, param3, param4, param5);
                 else
@@ -134 +143 @@
 
             Functor::Type::Enum getType() const
-                { return Functor::Type::Member; }
+                { return detail::FunctorTypeStatic<O>::result ? Functor::Type::Static : Functor::Type::Member; }
 
             inline void setObject(O* object)
@@ -150 +159 @@
     };
 
-    template <>
-    class _CoreExport FunctorMember<void> : public Functor
-    {
-        public:
-            FunctorMember(void* = 0) {}
-
-            virtual MultiType operator()(void* object, const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null) = 0;
-
-            MultiType operator()(const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null)
-            {
-                return (*this)(0, param1, param2, param3, param4, param5);
-            }
-
-            Functor::Type::Enum getType() const
-                { return Functor::Type::Static; }
-    };
-
     typedef FunctorMember<void> FunctorStatic;
 
-    template <class F, class O>
+    template <class F, class O = void>
     class FunctorPointer : public FunctorMember<O>
     {
@@ -238 +230 @@
         {};
 
-        template <typename T>
+        template <class T>
         struct FunctorHasReturnvalue
         { enum { result = true }; };