From 9592b6ed8d9425d63cae8ba009a91aff8527f0b6 Mon Sep 17 00:00:00 2001
From: pouillot <pouillot@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Mon, 6 Oct 2008 20:55:23 +0000
Subject: [PATCH] Fixed includes for GCC 4.3 compatibility

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

Former-commit-id: 9d6c9926ef9b36c2039f327effc7a44edf608852
Former-commit-id: f8c528c1464f02382ccd39f008c81db454cc407c
---
 src/drivers/K1999/K1999.cpp                   | 28 +++----------------
 src/drivers/olethros/Trajectory.cpp           |  6 +---
 .../simu/simuv2/SOLID-2.0/src/BBoxTree.cpp    |  6 ----
 .../simu/simuv2/SOLID-2.0/src/Complex.cpp     |  5 ----
 .../simu/simuv2/SOLID-2.0/src/Endpoint.cpp    |  5 ----
 .../simu/simuv2/SOLID-2.0/src/Object.cpp      |  5 ----
 6 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/src/drivers/K1999/K1999.cpp b/src/drivers/K1999/K1999.cpp
index 09c419a48..b3180c8de 100644
--- a/src/drivers/K1999/K1999.cpp
+++ b/src/drivers/K1999/K1999.cpp
@@ -12,34 +12,12 @@
 // (at your option) any later version.
 //
 ////////////////////////////////////////////////////////////////////////////
-#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
-
-#if defined(__GNUC__) && __GNUC__ > 2
 #include <strstream>
-#else
-#include <strstream.h>
-#endif // __GNUC__
-
-#endif // WIN32
-
-
-//#include <iomanip.h>
-// #include <iomanip> // GCC 4.3
+#include <iomanip>
 #include <math.h>
 #include <stdlib.h>
-//#include <fstream.h>
-// #include <fstream> // GCC 4.3
+#include <fstream>
 #include <string.h>
 
 #include "tgf.h" 
@@ -49,6 +27,8 @@ using namespace std;
 #include "robot.h" 
 #include "robottools.h"
 
+using namespace std;
+
 ////////////////////////////////////////////////////////////////////////////
 // Parameters
 ////////////////////////////////////////////////////////////////////////////
diff --git a/src/drivers/olethros/Trajectory.cpp b/src/drivers/olethros/Trajectory.cpp
index dbe40bcaf..12f802716 100644
--- a/src/drivers/olethros/Trajectory.cpp
+++ b/src/drivers/olethros/Trajectory.cpp
@@ -14,14 +14,10 @@
 #include <cassert>
 #include <list>
 #include <vector>
-//#include <cstring> //GCC 4.3
+#include <cstring>
 #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 87a666fd1..74bb95358 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
@@ -32,13 +32,7 @@
 #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 {
 public:
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 052f7fe3a..7b33c78f2 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
@@ -32,12 +32,7 @@
 #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 e89e7b6fe..33c2030d5 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
@@ -32,12 +32,7 @@
 #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);
 void removePair(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 ca561d831..9c364c489 100644
--- a/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
+++ b/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
@@ -33,12 +33,7 @@
 #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) : 
   ref(obj),