[libsigc++2] functor_trait.m4: Correct the mem_functor<> declarations.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsigc++2] functor_trait.m4: Correct the mem_functor<> declarations.
- Date: Thu, 7 Jan 2016 15:40:18 +0000 (UTC)
commit eb0139abd58b1fbe3dbf279f5d8cd60bdf46d571
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Jan 7 16:35:56 2016 +0100
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.
sigc++/functors/macros/functor_trait.h.m4 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/sigc++/functors/macros/functor_trait.h.m4 b/sigc++/functors/macros/functor_trait.h.m4
index 176fee2..59a9b9b 100644
--- a/sigc++/functors/macros/functor_trait.h.m4
+++ b/sigc++/functors/macros/functor_trait.h.m4
@@ -28,19 +28,19 @@ struct functor_trait<T_return (*)(LOOP(T_arg%1, $1)), false, false>
])
define([FUNCTOR_MEM_FUN],[dnl
-template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)> class mem_functor$1;
-template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)> class const_mem_functor$1;
+template <LIST(class T_return, class T_obj, LOOP(class T_arg%1, $1))> class mem_functor$1;
+template <LIST(class T_return, class T_obj, LOOP(class T_arg%1, $1))> class const_mem_functor$1;
template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)>
struct functor_trait<T_return (T_obj::*)(LOOP(T_arg%1, $1)), false, false>
{
typedef T_return result_type;
- typedef mem_functor$1<LIST(LOOP(T_arg%1, $1), T_return, T_obj)> functor_type;
+ typedef mem_functor$1<LIST(T_return, T_obj, LOOP(T_arg%1, $1))> functor_type;
};
template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)>
struct functor_trait<T_return (T_obj::*)(LOOP(T_arg%1, $1)) const, false, false>
{
typedef T_return result_type;
- typedef const_mem_functor$1<LIST(LOOP(T_arg%1, $1), T_return, T_obj)> functor_type;
+ typedef const_mem_functor$1<LIST(T_return, T_obj, LOOP(T_arg%1, $1))> functor_type;
};
])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]