[SCM] blobby Debian packaging branch, master, updated. debian/1.0_rc1-2

[Felix Geyer]

The following commit has been merged in the master branch:
commit fdf6a914d1b4368fb437899ca68b0038d8c9df33
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue May 1 11:23:18 2012 +0200

    Fix FTBFS with gcc 4.7.

diff --git a/debian/changelog b/debian/changelog
index bca2992..c48639c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+blobby (1.0~rc1-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS with gcc 4.7.
+    - Add 06_ftbfs_gcc47.patch
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 01 May 2012 11:18:41 +0200
+
 blobby (1.0~rc1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/06_ftbfs_gcc47.patch b/debian/patches/06_ftbfs_gcc47.patch
new file mode 100644
index 0000000..728228e
--- /dev/null
+++ b/debian/patches/06_ftbfs_gcc47.patch
@@ -0,0 +1,70 @@
+Description: Fix FTBFS with gcc 4.7.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+Bug: https://sourceforge.net/apps/mantisbt/blobby/view.php?id=95
+
+--- a/src/raknet/BinarySearchTree.h
++++ b/src/raknet/BinarySearchTree.h
+@@ -338,12 +338,12 @@ namespace BasicDataStructures
+ 			if ( current->left == 0 )
+ 				left_height = 0;
+ 			else
+-				left_height = height( current->left );
++				left_height = this->height( current->left );
+ 				
+ 			if ( current->right == 0 )
+ 				right_height = 0;
+ 			else
+-				right_height = height( current->right );
++				right_height = this->height( current->right );
+ 				
+ 			if ( right_height - left_height == 2 )
+ 			{
+@@ -371,7 +371,7 @@ namespace BasicDataStructures
+ 			if ( current == this->root )
+ 				break;
+ 				
+-			current = find_parent( *( current->item ) );
++			current = this->find_parent( *( current->item ) );
+ 			
+ 		}
+ 	}
+@@ -400,7 +400,7 @@ namespace BasicDataStructures
+ 		if ( A == 0 )
+ 			return false;
+ 			
+-		return height( A->right ) > height( A->left );
++		return this->height( A->right ) > this->height( A->left );
+ 	}
+ 	
+ 	template <class BinarySearchTreeType>
+@@ -409,7 +409,7 @@ namespace BasicDataStructures
+ 		if ( A == 0 )
+ 			return false;
+ 			
+-		return height( A->left ) > height( A->right );
++		return this->height( A->left ) > this->height( A->right );
+ 	}
+ 	
+ 	template <class BinarySearchTreeType>
+@@ -446,8 +446,8 @@ namespace BasicDataStructures
+ 		
+ 		*/
+ 		
+-		B = find_parent( *( C->item ) );
+-		A = find_parent( *( B->item ) );
++		B = this->find_parent( *( C->item ) );
++		A = this->find_parent( *( B->item ) );
+ 		D = C->right;
+ 		
+ 		if ( A )
+@@ -510,8 +510,8 @@ namespace BasicDataStructures
+ 		
+ 		*/
+ 		
+-		B = find_parent( *( C->item ) );
+-		A = find_parent( *( B->item ) );
++		B = this->find_parent( *( C->item ) );
++		A = this->find_parent( *( B->item ) );
+ 		D = C->left;
+ 		
+ 		if ( A )
diff --git a/debian/patches/series b/debian/patches/series
index 562e308..2d0cf35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_use_system_lua.patch
 04_use_system_tinyxml.patch
 05_server_config_file.patch
+06_ftbfs_gcc47.patch

-- 
blobby Debian packaging