--- btanks.orig/mrt/base_file.h 2009-04-04 15:28:59.000000000 -0500 +++ btanks/mrt/base_file.h 2012-10-11 00:24:20.257335332 -0500 @@ -20,6 +20,7 @@ */ #include +#include #include "export_mrt.h" namespace mrt { --- btanks.orig/math/range_list.h 2008-10-24 09:15:55.000000000 -0500 +++ btanks/math/range_list.h 2012-10-11 00:26:24.732432981 -0500 @@ -53,14 +53,14 @@ return; } - typename parent_type::iterator i = lower_bound(value); + typename parent_type::iterator i = this->lower_bound(value); if (i != parent_type::end()) { if (i->first == value) return; if (value + 1 == i->first) { T e = i->second; - erase(i); + this->erase(i); i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning i = pack_left(i); } --- btanks.orig/engine/sl08/sl08.h 2008-08-13 04:10:45.000000000 -0500 +++ btanks/engine/sl08/sl08.h 2012-10-11 01:49:09.226329460 -0500 @@ -22,6 +22,7 @@ /* DO NOT MODIFY THIS FILE: IT'S AUTOGENERATED */ #include +#include #ifndef NULL #define NULL ((void*) 0) @@ -271,7 +272,7 @@ 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 = NULL) { object = o; func = f; this->connect(signal_ref); } inline return_type operator() (arg1_type a1) const { return (object->*func) (a1) ; @@ -292,7 +293,7 @@ inline slot1 () : object(NULL), func(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); } + inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } inline void operator() (arg1_type a1) const { (object->*func) (a1); @@ -446,7 +447,7 @@ 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 = NULL) { object = o; func = f; this->connect(signal_ref); } inline return_type operator() (arg1_type a1, arg2_type a2) const { return (object->*func) (a1, a2) ; @@ -467,7 +468,7 @@ inline slot2 () : object(NULL), func(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); } + inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } inline void operator() (arg1_type a1, arg2_type a2) const { (object->*func) (a1, a2); @@ -642,7 +643,7 @@ inline slot3 () : object(NULL), func(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); } + inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const { (object->*func) (a1, a2, a3); @@ -796,7 +797,7 @@ 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 = NULL) { object = o; func = f; this->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) ; @@ -817,7 +818,7 @@ inline slot4 () : object(NULL), func(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); } + inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { (object->*func) (a1, a2, a3, a4); @@ -971,7 +972,7 @@ 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 = NULL) { object = o; func = f; this->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) ;