diff -uNr btanks-0.9.8083/engine/sl08/sl08.h btanks-0.9.8083p/engine/sl08/sl08.h

--- btanks-0.9.8083/engine/sl08/sl08.h	2013-01-08 21:10:45.699233784 +0200

+++ btanks-0.9.8083p/engine/sl08/sl08.h	2013-01-08 21:13:57.338362577 +0200

@@ -96,7 +96,7 @@

 			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 = NULL) { object = o; func = f; this->connect(signal_ref); }

 			inline return_type operator() () const { 

 				return (object->*func) () ;

@@ -117,7 +117,7 @@

 			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); }

+			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }

 			inline void operator() () const { 

 				(object->*func) (); 

@@ -271,7 +271,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 +292,7 @@

 			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); }

+			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 +446,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 +467,7 @@

 			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); }

+			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); 

@@ -621,7 +621,7 @@

 			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 = NULL) { object = o; func = f; this->connect(signal_ref); }

 			inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3) const { 

 				return (object->*func) (a1, a2, a3) ;

@@ -642,7 +642,7 @@

 			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); }

+			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 +796,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 +817,7 @@

 			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); }

+			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 +971,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) ;

@@ -992,7 +992,7 @@

 			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); }

+			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, arg5_type a5) const { 

 				(object->*func) (a1, a2, a3, a4, a5); 

diff -uNr btanks-0.9.8083/math/range_list.h btanks-0.9.8083p/math/range_list.h

--- btanks-0.9.8083/math/range_list.h	2008-10-24 17:15:55.000000000 +0300

+++ btanks-0.9.8083p/math/range_list.h	2013-01-08 21:29:31.081693190 +0200

@@ -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);

 			}

diff -uNr btanks-0.9.8083/mrt/base_file.h btanks-0.9.8083p/mrt/base_file.h

--- btanks-0.9.8083/mrt/base_file.h	2009-04-04 23:28:59.000000000 +0300

+++ btanks-0.9.8083p/mrt/base_file.h	2013-01-08 22:28:09.317937303 +0200

@@ -21,6 +21,7 @@

 #include <string>

 #include "export_mrt.h"

+#include <unistd.h>

 namespace mrt {