tags 461697 + patch thanks Hi,
Attached is the diff for my battleball 2.0-16.1 NMU. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega <[EMAIL PROTECTED]>
diff -u battleball-2.0/bb/player.C battleball-2.0/bb/player.C
--- battleball-2.0/bb/player.C
+++ battleball-2.0/bb/player.C
@@ -4,12 +4,13 @@
#include <ctype.h> // to get tolower()
-#include <string.h> // to get strncpy()
-#include <limits.h> // to get INT_MAX, LONG_MAX
+#include <cstring> // to get strncpy()
+#include <climits> // to get INT_MAX, LONG_MAX
#include <X11/keysym.h> // to get XK_*
-#include <algo.h> // ugh, this baby's big
+#include <algorithm> // ugh, this baby's big
#include "player.h"
+using namespace std;
#ifdef __GNUC__
char __stl_temp_buffer[16384]; //__stl_buffer_size does not exist in egcs.
@@ -179,7 +180,7 @@
vector<gobRef> refs;
for_(gi,gobs)
refs.push_back(gobRef(*gi,(**gi).DistFromViewer(eyePos)));
- ::stable_sort(refs.begin(),refs.end());
+ stable_sort(refs.begin(),refs.end());
// now insert gob parts into the list, in correct drawing order
gobList allGobs;
diff -u battleball-2.0/debian/battleball.6 battleball-2.0/debian/battleball.6
--- battleball-2.0/debian/battleball.6
+++ battleball-2.0/debian/battleball.6
@@ -299 +299 @@
-This man page was written by Chris Waters <[EMAIL PROTECTED]>.
\ No newline at end of file
+This man page was written by Chris Waters <[EMAIL PROTECTED]>.
diff -u battleball-2.0/debian/changelog battleball-2.0/debian/changelog
--- battleball-2.0/debian/changelog
+++ battleball-2.0/debian/changelog
@@ -1,3 +1,11 @@
+battleball (2.0-16.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.3. Thanks to Kumar Appaiah for the initial work on
+ the patch. (Closes: #461697)
+
+ -- James Vega <[EMAIL PROTECTED]> Thu, 03 Apr 2008 12:11:35 -0400
+
battleball (2.0-16) unstable; urgency=low
* Don't strip binaries if DEB_BUILD_OPTIONS=nostrip (closes: #436543).
diff -u battleball-2.0/lib3d/bsppanel3d.C battleball-2.0/lib3d/bsppanel3d.C
--- battleball-2.0/lib3d/bsppanel3d.C
+++ battleball-2.0/lib3d/bsppanel3d.C
@@ -3,10 +3,10 @@
// it under the terms of the GNU General Public License v2 or later.
-#include <iostream.h>
+#include <iostream>
#include "bsppanel3d.h"
-
+using namespace std;
/***************************************************************************/
bspPanel3d::bspPanel3d(const Polygon3f& poly, fastPts& pts,
only in patch2:
unchanged:
--- battleball-2.0.orig/bb/gob.h
+++ battleball-2.0/bb/gob.h
@@ -8,13 +8,14 @@
#define BBGOB_h
-#include <list.h>
-#include <vector.h>
+#include <list>
+#include <vector>
#include "view.h"
#include "bb.h"
#include "bbgfxtarget.h"
+using namespace std;
// Notes:
// gob is an abbreviation for Game OBject
only in patch2:
unchanged:
--- battleball-2.0.orig/bb/bbgfxtarget.C
+++ battleball-2.0/bb/bbgfxtarget.C
@@ -3,11 +3,12 @@
// it under the terms of the GNU General Public License v2 or later.
-#include <string.h> // to get strlen
-#include <iostream.h>
+#include <cstring> // to get strlen
+#include <iostream>
#include <X11/Xlib.h> // to get XEvent, XFontStruct
#include "bbgfxtarget.h"
+using namespace std;
#define DEFAULTWINWIDTH 512
#define DEFAULTWINHEIGHT (256+6*14+2)
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/region3d.h
+++ battleball-2.0/lib3d/region3d.h
@@ -7,8 +7,8 @@
#define REGION3D_h
-#include <iostream.h>
-#include <list.h> // STL
+#include <iostream>
+#include <list> // STL
#include "general.h"
#include "xform.h"
#include "region2d.h"
@@ -18,6 +18,7 @@
#include "edgetable.h"
#include "xpanel3d.h"
+using namespace std;
extern const pt3d::coord COORD_MAX;
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/xform.h
+++ battleball-2.0/lib3d/xform.h
@@ -7,11 +7,12 @@
#define TRANSFORM_h
-#include <iostream.h>
+#include <iostream>
#include "general.h"
#include "pt3d.h"
#include "ang3d.h"
+using namespace std;
//==========================================================================
/* Transformation classes tmtrx and tcomp.
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/dimension.C
+++ battleball-2.0/lib3d/dimension.C
@@ -3,10 +3,10 @@
// it under the terms of the GNU General Public License v2 or later.
-#include <iostream.h>
+#include <iostream>
#include "dimension.h"
-
+using namespace std;
/************************************************************************/
ostream& operator<<(ostream& out, const dimension& d) {
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/xform.C
+++ battleball-2.0/lib3d/xform.C
@@ -4,10 +4,10 @@
#include <math.h>
-#include <iomanip.h>
+#include <iomanip>
#include "xform.h"
-
+using namespace std;
//===========================================================================
// Extend the pt3d class!
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/fastpts.h
+++ battleball-2.0/lib3d/fastpts.h
@@ -7,12 +7,13 @@
#define FASTPTS_h
-#include <iostream.h>
+#include <iostream>
#include "general.h"
#include "table.h"
#include "xform.h"
#include "dimentable.h"
+using namespace std;
/*=========================================================================*/
struct pt3dPtr {
@@ -70,7 +71,7 @@
int Num() const {return pts.Num();}
pnt *Array() const {return pts.Array();}
pnt& operator[](int i) const {return pts[i];}
- table<pnt>& table() {return pts;}
+ pntTable& getTable() {return pts;}
};
#ifdef FASTPTS_TEMPLATE
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/dimentable.h
+++ battleball-2.0/lib3d/dimentable.h
@@ -7,9 +7,10 @@
#define DIMENTABLE_h
-#include <list.h> // STL
+#include <list> // STL
#include "dimension.h"
+using namespace std;
/*=========================================================================*/
struct dimenTable {
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/region3d.C
+++ battleball-2.0/lib3d/region3d.C
@@ -44,7 +44,7 @@
if (wantEdges)
for(p= otherPanels.begin(); p != otherPanels.end(); p++)
edges.AddPanel(*p);
- box.MakeBoundingBox(pts.table(),farthestDist);
+ box.MakeBoundingBox(pts.getTable(),farthestDist);
}
@@ -83,7 +83,7 @@
int region3d::Add(const xpanel3d& p) {
if (p.ptNums.Num() >0) {
edges.AddPanel(p);
- box.MakeBoundingBox(pts.table(), farthestDist);
+ box.MakeBoundingBox(pts.getTable(), farthestDist);
return panels.Add(p);
}
else
@@ -123,7 +123,7 @@
//panels[panels.Num()-1].normal *= normalDir;
edges.AddPanel(panels[panels.Num()-1]);
}
- box.MakeBoundingBox(pts.table(),farthestDist);
+ box.MakeBoundingBox(pts.getTable(),farthestDist);
}
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/pt3d.h
+++ battleball-2.0/lib3d/pt3d.h
@@ -7,11 +7,12 @@
#define PT3D_h
-#include <iostream.h>
+#include <iostream>
#include "general.h"
#include "pt2d.h"
#include "ang3d.h"
+using namespace std;
/*=========================================================================*/
struct pt3d : pt2d {
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/gfxtarget.C
+++ battleball-2.0/lib3d/gfxtarget.C
@@ -3,9 +3,10 @@
// it under the terms of the GNU General Public License v2 or later.
-#include <iostream.h>
+#include <iostream>
#include "gfxtarget.h"
+using namespace std;
/************************************************************************/
// In: dispName = name of X display to open
only in patch2:
unchanged:
--- battleball-2.0.orig/lib3d/ang3d.h
+++ battleball-2.0/lib3d/ang3d.h
@@ -7,10 +7,11 @@
#define ANG3D_h
-#include <iostream.h>
+#include <iostream>
#include "general.h"
#include "ang2d.h"
+using namespace std;
struct ang3d
{ ang2d xy, // angle in XY plane
signature.asc
Description: Digital signature
