Skip to content

Commit eb0139a

Browse files
committed
functor_trait.m4: Correct the mem_functor<> declarations.
The first template types are T_return and T_obj, not the arguments. This doesn't seem to have been a problem. Maybe this code is not tested or used.
1 parent 260d2fd commit eb0139a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sigc++/functors/macros/functor_trait.h.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ struct functor_trait<T_return (*)(LOOP(T_arg%1, $1)), false, false>
2828
2929
])
3030
define([FUNCTOR_MEM_FUN],[dnl
31-
template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)> class mem_functor$1;
32-
template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)> class const_mem_functor$1;
31+
template <LIST(class T_return, class T_obj, LOOP(class T_arg%1, $1))> class mem_functor$1;
32+
template <LIST(class T_return, class T_obj, LOOP(class T_arg%1, $1))> class const_mem_functor$1;
3333
template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)>
3434
struct functor_trait<T_return (T_obj::*)(LOOP(T_arg%1, $1)), false, false>
3535
{
3636
typedef T_return result_type;
37-
typedef mem_functor$1<LIST(LOOP(T_arg%1, $1), T_return, T_obj)> functor_type;
37+
typedef mem_functor$1<LIST(T_return, T_obj, LOOP(T_arg%1, $1))> functor_type;
3838
};
3939
template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)>
4040
struct functor_trait<T_return (T_obj::*)(LOOP(T_arg%1, $1)) const, false, false>
4141
{
4242
typedef T_return result_type;
43-
typedef const_mem_functor$1<LIST(LOOP(T_arg%1, $1), T_return, T_obj)> functor_type;
43+
typedef const_mem_functor$1<LIST(T_return, T_obj, LOOP(T_arg%1, $1))> functor_type;
4444
};
4545
4646
])

0 commit comments

Comments
 (0)