1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
From: Ansgar Burchardt <ansgar@debian.org>
Bug-Debian: http://bugs.debian.org/624916
Subject: Fix FTBFS with gcc-4.6
--- btanks-0.9.8083.orig/engine/sl08/sl08.py
+++ btanks-0.9.8083/engine/sl08/sl08.py
@@ -152,8 +152,8 @@ class Generator(object):
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(0), func(0) {}
+ inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : 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); }
@@ -187,7 +187,7 @@ class Generator(object):
typedef base_signalXXX %s signal_type;
typedef void (object_type::*func_t) %s ;
- inline slotXXX () : object(NULL), func(NULL) {}
+ inline slotXXX () : object(0), 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); }
|
