[btanks] Adjust constructor type casts.
Bruno Wolff III
bruno at fedoraproject.org
Sun Jun 26 19:16:11 UTC 2011
commit 53ca045b85d6b591671593f75eda51336c1eeeb7
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sun Jun 26 10:55:09 2011 -0500
Adjust constructor type casts.
btanks-gcc.patch | 106 ++++++++++++++++-------------------------------------
1 files changed, 32 insertions(+), 74 deletions(-)
---
diff --git a/btanks-gcc.patch b/btanks-gcc.patch
index 977b30b..1e3bc15 100644
--- a/btanks-gcc.patch
+++ b/btanks-gcc.patch
@@ -1,172 +1,130 @@
---- engine/sl08/sl08.py.orig 2011-06-25 11:12:21.000000000 -0500
-+++ engine/sl08/sl08.py 2011-06-25 11:22:51.000000000 -0500
-@@ -152,11 +152,11 @@
+--- engine/sl08/sl08.py.gcc 2008-08-13 04:10:45.000000000 -0500
++++ engine/sl08/sl08.py 2011-06-26 10:52:25.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_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
-+ inline slotXXX () : object(NULL), func(((func_t*)NULL)) {}
-+ inline slotXXX(object_type *object, func_t func, signal_type * signal = (func_t*)NULL) : object(object), func(func) {}
++ inline slotXXX () : object(((object_type*)NULL)), func(((return_type)NULL)) {}
+ 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; }
-- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
-+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = (func_t**)NULL) { object = o; func = f; connect(signal_ref); }
-
- inline return_type operator() %s const {
- return (object->*func) %s ;
@@ -187,7 +187,7 @@
typedef base_signalXXX %s signal_type;
typedef void (object_type::*func_t) %s ;
- inline slotXXX () : object(NULL), func(NULL) {}
-+ inline slotXXX () : object(NULL), func(((func_t*)NULL)) {}
++ inline slotXXX () : object(((object_type*)NULL), func(((return_type)NULL)) {}
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.orig 2011-06-25 11:41:32.000000000 -0500
-+++ engine/sl08/sl08.h 2011-06-25 11:43:37.000000000 -0500
-@@ -92,11 +92,11 @@
+--- engine/sl08/sl08.h.gcc 2008-08-13 04:10:45.000000000 -0500
++++ engine/sl08/sl08.h 2011-06-26 10:53:55.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_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
-+ inline slot0 () : object(NULL), func(((func_t*)NULL)) {}
-+ inline slot0(object_type *object, func_t func, signal_type * signal = (func_t*)NULL) : object(object), func(func) {}
++ inline slot0 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
+ 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; }
-- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
-+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = (func_t*)NULL) { object = o; func = f; connect(signal_ref); }
-
- inline return_type operator() () const {
- return (object->*func) () ;
@@ -114,7 +114,7 @@
typedef base_signal0 <void> signal_type;
typedef void (object_type::*func_t) () ;
- inline slot0 () : object(NULL), func(NULL) {}
-+ inline slot0 () : object(NULL), func(((func_t*)NULL)) {}
++ inline slot0 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
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); }
-@@ -267,11 +267,11 @@
+@@ -267,7 +267,7 @@
typedef base_signal1 <return_type, arg1_type> signal_type;
typedef return_type (object_type::*func_t) (arg1_type a1);
- inline slot1 () : object(NULL), func(NULL) {}
-- inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
-+ inline slot1 () : object(NULL), func(((func_t*)NULL)) {}
-+ inline slot1(object_type *object, func_t func, signal_type * signal = (func_t*)NULL) : object(object), func(func) {}
++ inline slot1 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
+ 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; }
-- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
-+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = (func_t*)NULL) { object = o; func = f; connect(signal_ref); }
-
- inline return_type operator() (arg1_type a1) const {
- return (object->*func) (a1) ;
@@ -289,7 +289,7 @@
typedef base_signal1 <void, arg1_type> signal_type;
typedef void (object_type::*func_t) (arg1_type a1) ;
- inline slot1 () : object(NULL), func(NULL) {}
-+ inline slot1 () : object(NULL), func(((func_t*)NULL)) {}
++ inline slot1 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
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); }
-@@ -442,11 +442,11 @@
+@@ -442,7 +442,7 @@
typedef base_signal2 <return_type, arg1_type, arg2_type> signal_type;
typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2);
- inline slot2 () : object(NULL), func(NULL) {}
-- inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
-+ inline slot2 () : object(NULL), func(((func_t*)NULL)) {}
-+ inline slot2(object_type *object, func_t func, signal_type * signal = (func_t*)NULL) : object(object), func(func) {}
++ inline slot2 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
+ 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; }
-- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
-+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = (func_t*)NULL) { object = o; func = f; connect(signal_ref); }
-
- inline return_type operator() (arg1_type a1, arg2_type a2) const {
- return (object->*func) (a1, a2) ;
@@ -464,7 +464,7 @@
typedef base_signal2 <void, arg1_type, arg2_type> signal_type;
typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2) ;
- inline slot2 () : object(NULL), func(NULL) {}
-+ inline slot2 () : object(NULL), func(((func_t*)NULL)) {}
++ inline slot2 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
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); }
-@@ -617,11 +617,11 @@
+@@ -617,7 +617,7 @@
typedef base_signal3 <return_type, arg1_type, arg2_type, arg3_type> signal_type;
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_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
-+ inline slot3 () : object(NULL), func(((func_t*)NULL)) {}
-+ inline slot3(object_type *object, func_t func, signal_type * signal = (func_t*)NULL) : object(object), func(func) {}
++ inline slot3 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
+ 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; }
-- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
-+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = (func_t*)NULL) { object = o; func = f; connect(signal_ref); }
-
- inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3) const {
- return (object->*func) (a1, a2, a3) ;
@@ -639,7 +639,7 @@
typedef base_signal3 <void, arg1_type, arg2_type, arg3_type> signal_type;
typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3) ;
- inline slot3 () : object(NULL), func(NULL) {}
-+ inline slot3 () : object(NULL), func(((func_t*)NULL)) {}
++ inline slot3 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
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); }
-@@ -792,11 +792,11 @@
+@@ -792,7 +792,7 @@
typedef base_signal4 <return_type, arg1_type, arg2_type, arg3_type, arg4_type> signal_type;
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_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
-+ inline slot4 () : object(NULL), func(((func_t*)NULL)) {}
-+ inline slot4(object_type *object, func_t func, signal_type * signal = (func_t*)NULL) : object(object), func(func) {}
++ inline slot4 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
+ 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; }
-- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
-+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = (func_t*)NULL) { object = o; func = f; connect(signal_ref); }
-
- inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const {
- return (object->*func) (a1, a2, a3, a4) ;
@@ -814,7 +814,7 @@
typedef base_signal4 <void, arg1_type, arg2_type, arg3_type, arg4_type> signal_type;
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(NULL), func(((func_t*)NULL)) {}
++ inline slot4 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
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); }
-@@ -967,11 +967,11 @@
+@@ -967,7 +967,7 @@
typedef base_signal5 <return_type, arg1_type, arg2_type, arg3_type, arg4_type, arg5_type> signal_type;
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_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
-+ inline slot5 () : object(NULL), func(((func_t*)NULL)) {}
-+ inline slot5(object_type *object, func_t func, signal_type * signal = (func_t*)NULL) : object(object), func(func) {}
++ inline slot5 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
+ 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; }
-- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
-+ inline void assign(object_type *o, func_t f, signal_type &signal_ref = (func_t*)NULL) { object = o; func = f; connect(signal_ref); }
-
- inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const {
- return (object->*func) (a1, a2, a3, a4, a5) ;
@@ -989,7 +989,7 @@
typedef base_signal5 <void, arg1_type, arg2_type, arg3_type, arg4_type, arg5_type> signal_type;
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(NULL), func(((func_t*)NULL)) {}
++ inline slot5 () : object(((objetc_type*)NULL)), func(((return_type)NULL)) {}
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