From 303a9de04524745bf9bd0ae7557d96532ca15864 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Fri, 20 Feb 2015 22:45:00 +0300 Subject: [PATCH] Test --- rpcs3/Emu/SysCalls/SC_FUNC.h | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/rpcs3/Emu/SysCalls/SC_FUNC.h b/rpcs3/Emu/SysCalls/SC_FUNC.h index 625f2145e7..5a0f91fbf4 100644 --- a/rpcs3/Emu/SysCalls/SC_FUNC.h +++ b/rpcs3/Emu/SysCalls/SC_FUNC.h @@ -165,22 +165,6 @@ namespace ppu_func_detail template struct func_binder; - template - struct func_binder - { - typedef void(*func_t)(T...); - - static void do_call(PPUThread& CPU, func_t _func) - { - call(_func, iterate<0, 0, 0, T...>(CPU)); - } - - static void do_call(PPUThread& CPU) - { - do_call(CPU, (func_t)func); - } - }; - template struct func_binder { @@ -197,14 +181,14 @@ namespace ppu_func_detail } }; - template - struct func_binder + template + struct func_binder { - typedef RT(*func_t)(T...); + typedef void(*func_t)(T...); static void do_call(PPUThread& CPU, func_t _func) { - bind_result::value>::func(CPU, call(_func, iterate<0, 0, 0, T...>(CPU))); + call(_func, iterate<0, 0, 0, T...>(CPU)); } static void do_call(PPUThread& CPU) @@ -229,6 +213,22 @@ namespace ppu_func_detail } }; + template + struct func_binder + { + typedef RT(*func_t)(T...); + + static void do_call(PPUThread& CPU, func_t _func) + { + bind_result::value>::func(CPU, call(_func, iterate<0, 0, 0, T...>(CPU))); + } + + static void do_call(PPUThread& CPU) + { + do_call(CPU, (func_t)func); + } + }; + template ps3_func_caller _bind_func(RT(*_func)(T...)) {