From 12742e536b085c940204aa02091117daf210f26f Mon Sep 17 00:00:00 2001
From: torcs-ng <torcs-ng@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Mon, 22 Sep 2008 19:52:41 +0000
Subject: [PATCH] GCC 4.3 support

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@34 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 87b8f87363b178378c94c767a5dc617b299d3fa1
Former-commit-id: d489984eba25510ed75daabfe188b115f0db5718
---
 src/drivers/K1999/K1999.cpp                      | 16 ++++++++++++----
 src/drivers/olethros/Trajectory.cpp              |  4 +++-
 .../simu/simuv2/SOLID-2.0/src/BBoxTree.cpp       |  5 +++++
 .../simu/simuv2/SOLID-2.0/src/Complex.cpp        |  4 ++++
 .../simu/simuv2/SOLID-2.0/src/Endpoint.cpp       |  4 ++++
 src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp |  4 ++++
 6 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/drivers/K1999/K1999.cpp b/src/drivers/K1999/K1999.cpp
index ba076b11..09c419a4 100644
--- a/src/drivers/K1999/K1999.cpp
+++ b/src/drivers/K1999/K1999.cpp
@@ -12,9 +12,16 @@
 // (at your option) any later version.
 //
 ////////////////////////////////////////////////////////////////////////////
-// #include <iostream> // GCC 4.3
-// using namespace std; // GCC 4.3
+#if defined(__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 2
+#include <iostream>
+#include <iomanip>
+#include <fstream>
+using namespace std;
+#else
 #include <iostream.h>
+#include <iomanip.h>
+#include <fstream.h>
+#endif // __GNUC__
 
 #ifndef WIN32
 
@@ -26,11 +33,12 @@
 
 #endif // WIN32
 
-#include <iomanip.h>
+
+//#include <iomanip.h>
 // #include <iomanip> // GCC 4.3
 #include <math.h>
 #include <stdlib.h>
-#include <fstream.h>
+//#include <fstream.h>
 // #include <fstream> // GCC 4.3
 #include <string.h>
 
diff --git a/src/drivers/olethros/Trajectory.cpp b/src/drivers/olethros/Trajectory.cpp
index 2e80b85d..dbe40bca 100644
--- a/src/drivers/olethros/Trajectory.cpp
+++ b/src/drivers/olethros/Trajectory.cpp
@@ -18,7 +18,9 @@
 #include "Trajectory.h"
 #include <time.h>
 
-
+#if defined(__GNUC__) && __GNUC__ > 3 &&__GNUC_MINOR__ > 2
+#include <cstring>
+#endif // __GNUC__
 
 /// Return a point
 Point Trajectory::GetPoint (Segment& s, float w)
diff --git a/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp b/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
index bdc16b3c..87a666fd 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
@@ -32,7 +32,12 @@
 #include "Transform.h"
 
 #include <algorithm>
+
+#if defined(__GNUC__) && __GNUC__ > 3 &&__GNUC_MINOR__ > 2
+#include <new>
+#else
 #include <new.h>
+#endif
 // #include <new> // GCC 4.3
 
 class BBoxCompAxis {
diff --git a/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp b/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
index 0be3be79..052f7fe3 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
@@ -32,7 +32,11 @@
 #include "Transform.h"
 #include "BBoxTree.h"
 
+#if defined(__GNUC__) && __GNUC__ > 3 &&__GNUC_MINOR__ > 2
+#include <new>
+#else
 #include <new.h>
+#endif
 // #include <new> // GCC 4.3
 
 BBoxInternal *free_node;
diff --git a/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp b/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
index 65e32960..e89e7b6f 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
@@ -32,7 +32,11 @@
 #include "Object.h"
 #include "Encounter.h"
 
+#if defined(__GNUC__) && __GNUC__ > 3 &&__GNUC_MINOR__ > 2
+#include <new>
+#else
 #include <new.h>
+#endif
 // #include <new> // GCC 4.3
 
 void addPair(ObjectPtr object1, ObjectPtr object2);
diff --git a/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp b/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
index 262f714b..ca561d83 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
@@ -33,7 +33,11 @@
 #include "Convex.h" 
 #include "Complex.h" 
 
+#if defined(__GNUC__) && __GNUC__ > 3 &&__GNUC_MINOR__ > 2
+#include <new>
+#else
 #include <new.h>
+#endif
 // #include <new> // GCC 4.3
 
 Object::Object(DtObjectRef obj, ShapePtr shape) :