[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.81.2.1+dfsg1-4-7-gd94c851

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 98509fc40f76fae247bd7fd1f93e2c4c8133f9ec
Author: Jan Dittberner <jandd at debian.org>
Date:   Fri May 28 00:44:17 2010 +0200

    add cast to clsNameExternal_c for field comparison

diff --git a/debian/patches/0004-fix-gcj-4.4-compilation.patch b/debian/patches/0004-fix-gcj-4.4-compilation.patch
index fcc2528..106c388 100644
--- a/debian/patches/0004-fix-gcj-4.4-compilation.patch
+++ b/debian/patches/0004-fix-gcj-4.4-compilation.patch
@@ -22,7 +22,7 @@ Subject: gcj-4.4 does not have full support for generics, this patch replaces
  		print("\t\t" "final int BEFORE = -1;") >> outFile_c;
  		print("\t\t" "final int EQUAL  =  0;") >> outFile_c;
  		print("\t\t" "final int AFTER  =  1;") >> outFile_c;
-@@ -344,14 +344,14 @@
+@@ -344,16 +344,16 @@
  		print("") >> outFile_c;
  
  		if (isClbRootCls) {
@@ -39,5 +39,8 @@ Subject: gcj-4.4 does not have full support for generics, this patch replaces
 +				print("\t\t" "if (this.get" capitalize(addIndName) "() < ((" clsNameExternal_c ") other).get" capitalize(addIndName) "()) return BEFORE;") >> outFile_c;
 +				print("\t\t" "if (this.get" capitalize(addIndName) "() > ((" clsNameExternal_c ") other).get" capitalize(addIndName) "()) return AFTER;") >> outFile_c;
  			}
- 			print("\t\t" "return this." myClassVar ".compareTo(other." myClassVar ");") >> outFile_c;
+-			print("\t\t" "return this." myClassVar ".compareTo(other." myClassVar ");") >> outFile_c;
++			print("\t\t" "return this." myClassVar ".compareTo(((" clsNameExternal_c ") other)." myClassVar ");") >> outFile_c;
  		}
+ 		print("\t" "}") >> outFile_c;
+ 		print("") >> outFile_c;

-- 
advanced 3D real time strategy game engine