Changeset 7212 for code/branches/consolecommands3/src/libraries/core/command/FunctorPtr.h

Timestamp:

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

Author:

landauf

Message:

re-implemented Functor - without macros!

File:

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

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

@@ -37 +37 @@
     typedef SharedPtr<Functor> FunctorPtr;
 
-    typedef SharedChildPtr<FunctorStatic, FunctorPtr> FunctorStaticPtr;
-
     template <class T>
     class FunctorMemberPtr : public SharedChildPtr<FunctorMember<T>, FunctorPtr>
@@ -47 +45 @@
             inline FunctorMemberPtr(const SharedPtr<FunctorMember<T> >& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
     };
+
+    typedef FunctorMemberPtr<void> FunctorStaticPtr;
+
+    template <class F, class T>
+    class FunctorPointerPtr : public SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >
+    {
+        public:
+            inline FunctorPointerPtr() : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >() {}
+            inline FunctorPointerPtr(FunctorPointer<F, T>* pointer) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >(pointer) {}
+            inline FunctorPointerPtr(const SharedPtr<FunctorPointer<F, T> >& other) : SharedChildPtr<FunctorPointer<F, T>, FunctorMemberPtr<T> >(other) {}
+    };
 }