method_pointer: クラスのポインタとか、参照とか指定する、call()

diff --git a/roast/include/roast/tp/method_pointer.hpp b/roast/include/roast/tp/method_pointer.hpp
index 3904406..eef1314 100644 (file)
--- a/roast/include/roast/tp/method_pointer.hpp
+++ b/roast/include/roast/tp/method_pointer.hpp
@@ -25,6 +25,7 @@ namespace roast
                
                method_pointer() : class_ptr(0), func_ptr(0){}
                method_pointer(method_pointer_type p) : class_ptr(0), func_ptr(p){}
+               method_pointer(_Class &class_ref, method_pointer_type p_func) : class_ptr(&class_ref), func_ptr(p_func){}
                method_pointer(_Class *p_class, method_pointer_type p_func) : class_ptr(p_class), func_ptr(p_func){}
 
                _Ret call(){
@@ -38,6 +39,26 @@ namespace roast
                {
                        return call();
                }
+
+               _Ret call(_Class *p_class){
+                       class_ptr = p_class;
+                       return call();
+               }
+               _Ret operator()(_Class *p_class)
+               {
+                       class_ptr = p_class;
+                       return call();
+               }
+
+               _Ret call(_Class &class_ref){
+                       class_ptr = &class_ref;
+                       return call();
+               }
+               _Ret operator()(_Class &class_ref)
+               {
+                       class_ptr = &class_ref;
+                       return call();
+               }
        };
        
        /////////////////////////////////////////////////////////////

diff --git a/roast/test/server_socket_test/server_socket_test.cpp b/roast/test/server_socket_test/server_socket_test.cpp
index 82833af..aefef4f 100644 (file)
--- a/roast/test/server_socket_test/server_socket_test.cpp
+++ b/roast/test/server_socket_test/server_socket_test.cpp
@@ -26,7 +26,9 @@ void main( void )
                //server_socket<connection_thread> ss(99);
 
                method_pointer<void, A> p = &A::hoge;
-               p();
+               A a;
+               p(a);
+               p(&a);
        }
        catch(const exception &e)
        {