[btanks] Remove void * cast from func constructor.
Bruno Wolff III
bruno at fedoraproject.org
Sun Jun 26 19:16:21 UTC 2011
commit bffa254409014636508f7bc53e916a6b526fff1a
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sun Jun 26 11:40:44 2011 -0500
Remove void * cast from func constructor.
Casting to void * before casting to the real type just seems to
mess things up.
btanks-gcc.patch | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/btanks-gcc.patch b/btanks-gcc.patch
index ca355ba..c8cad55 100644
--- a/btanks-gcc.patch
+++ b/btanks-gcc.patch
@@ -1,11 +1,11 @@
--- engine/sl08/sl08.py.gcc 2008-08-13 04:10:45.000000000 -0500
-+++ engine/sl08/sl08.py 2011-06-26 10:56:15.000000000 -0500
++++ engine/sl08/sl08.py 2011-06-26 11:36:40.000000000 -0500
@@ -152,7 +152,7 @@
typedef base_signalXXX %s signal_type;
typedef return_type (object_type::*func_t) %s;
- inline slotXXX () : object(NULL), func(NULL) {}
-+ inline slotXXX () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slotXXX () : object(((object_type*)NULL)), func(0) {}
inline slotXXX(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
@@ -14,18 +14,18 @@
typedef void (object_type::*func_t) %s ;
- inline slotXXX () : object(NULL), func(NULL) {}
-+ inline slotXXX () : object(((object_type*)NULL), func(((return_type)NULL)) {}
++ inline slotXXX () : object(((object_type*)NULL), func(0) {}
inline slotXXX (object_type *object, func_t func) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
--- engine/sl08/sl08.h.gcc 2008-08-13 04:10:45.000000000 -0500
-+++ engine/sl08/sl08.h 2011-06-26 10:58:11.000000000 -0500
++++ engine/sl08/sl08.h 2011-06-26 11:35:21.000000000 -0500
@@ -92,7 +92,7 @@
typedef base_signal0 <return_type> signal_type;
typedef return_type (object_type::*func_t) ();
- inline slot0 () : object(NULL), func(NULL) {}
-+ inline slot0 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot0 () : object(((object_type*)NULL)), func(0) {}
inline slot0(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
@@ -34,7 +34,7 @@
typedef void (object_type::*func_t) () ;
- inline slot0 () : object(NULL), func(NULL) {}
-+ inline slot0 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot0 () : object(((object_type*)NULL)), func(0) {}
inline slot0 (object_type *object, func_t func) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
@@ -43,7 +43,7 @@
typedef return_type (object_type::*func_t) (arg1_type a1);
- inline slot1 () : object(NULL), func(NULL) {}
-+ inline slot1 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot1 () : object(((object_type*)NULL)), func(0) {}
inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
@@ -52,7 +52,7 @@
typedef void (object_type::*func_t) (arg1_type a1) ;
- inline slot1 () : object(NULL), func(NULL) {}
-+ inline slot1 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot1 () : object(((object_type*)NULL)), func(0) {}
inline slot1 (object_type *object, func_t func) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
@@ -61,7 +61,7 @@
typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2);
- inline slot2 () : object(NULL), func(NULL) {}
-+ inline slot2 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot2 () : object(((object_type*)NULL)), func(0) {}
inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
@@ -70,7 +70,7 @@
typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2) ;
- inline slot2 () : object(NULL), func(NULL) {}
-+ inline slot2 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot2 () : object(((object_type*)NULL)), func(0) {}
inline slot2 (object_type *object, func_t func) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
@@ -79,7 +79,7 @@
typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3);
- inline slot3 () : object(NULL), func(NULL) {}
-+ inline slot3 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot3 () : object(((object_type*)NULL)), func(0) {}
inline slot3(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
@@ -88,7 +88,7 @@
typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3) ;
- inline slot3 () : object(NULL), func(NULL) {}
-+ inline slot3 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot3 () : object(((object_type*)NULL)), func(0) {}
inline slot3 (object_type *object, func_t func) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
@@ -97,7 +97,7 @@
typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4);
- inline slot4 () : object(NULL), func(NULL) {}
-+ inline slot4 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot4 () : object(((object_type*)NULL)), func(0) {}
inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
@@ -106,7 +106,7 @@
typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) ;
- inline slot4 () : object(NULL), func(NULL) {}
-+ inline slot4 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot4 () : object(((object_type*)NULL)), func(0) {}
inline slot4 (object_type *object, func_t func) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
@@ -115,7 +115,7 @@
typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5);
- inline slot5 () : object(NULL), func(NULL) {}
-+ inline slot5 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot5 () : object(((object_type*)NULL)), func(0) {}
inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
@@ -124,7 +124,7 @@
typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) ;
- inline slot5 () : object(NULL), func(NULL) {}
-+ inline slot5 () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
++ inline slot5 () : object(((object_type*)NULL)), func(0) {}
inline slot5 (object_type *object, func_t func) : object(object), func(func) {}
inline void assign(object_type *o, func_t f) { object = o; func = f; }
inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
More information about the scm-commits
mailing list