[SCM] WorldForge 3D client branch, master, updated. upstream/0.6.2-45-gc150605

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit b9601902c4926d0c05f545f4bea078e056e4e1de
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Tue May 8 12:21:38 2012 -0700

    0011-qualify-template-function.patch: fixes FTBFS using GCC 4.7

diff --git a/debian/changelog b/debian/changelog
index f468d39..521f329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ ember (0.6.2-1) unstable; urgency=low
     - used GPL-compatible boost::function instead
   * 0009-spelling-bach.patch: fix spelling mistake
   * 0010-fix-ember-script-args.patch: fix argument handling in script
+  * 0011-qualify-template-function.patch: fixes FTBFS using GCC 4.7
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sun, 22 Apr 2012 20:35:04 -0400
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 08 May 2012 12:20:46 -0700
 
 ember (0.5.7-1.1) unstable; urgency=high
 
diff --git a/debian/patches/0011-qualify-template-functions.patch b/debian/patches/0011-qualify-template-functions.patch
new file mode 100644
index 0000000..d09c2d2
--- /dev/null
+++ b/debian/patches/0011-qualify-template-functions.patch
@@ -0,0 +1,28 @@
+--- a/src/components/lua/Connectors_impl.h
++++ b/src/components/lua/Connectors_impl.h
+@@ -120,7 +120,7 @@
+ template <typename TReturn>
+ TReturn ConnectorZero<TReturn>::signal_receive()
+ {
+-	callLuaMethod(Empty(), Empty());
++	this->callLuaMethod(Empty(), Empty());
+ 	return returnValueFromLua<TReturn>();
+ }
+ 
+@@ -128,14 +128,14 @@
+ template <typename TReturn, typename TAdapter0, typename T0>
+ TReturn ConnectorOne<TReturn, TAdapter0, T0>::signal_receive(const T0 t0)
+ {
+-	callLuaMethod(t0, Empty());
++	this->callLuaMethod(t0, Empty());
+ 	return ConnectorBase::returnValueFromLua<TReturn>();
+ }
+ 
+ template <typename TReturn, typename TAdapter0, typename TAdapter1, typename T0, typename T1>
+ TReturn ConnectorTwo<TReturn, TAdapter0, TAdapter1, T0, T1>::signal_receive(const T0 t0, const T1 t1)
+ {
+-	callLuaMethod(t0, t1);
++	this->callLuaMethod(t0, t1);
+ 	return ConnectorBase::returnValueFromLua<TReturn>();
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 73a9e06..68e4b9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-replace-fastdeletegate-with-boost.patch
 0009-spelling-bach.patch
 0010-fix-ember-script-args.patch
+0011-qualify-template-functions.patch

-- 
WorldForge 3D client