61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
|
diff -Naupr torcs-1.3.0.orig/src/drivers/olethros/Trajectory.cpp torcs-1.3.0/src/drivers/olethros/Trajectory.cpp
|
||
|
|
--- torcs-1.3.0.orig/src/drivers/olethros/Trajectory.cpp 2006-11-05 02:49:55.000000000 +0100
|
||
|
|
+++ torcs-1.3.0/src/drivers/olethros/Trajectory.cpp 2008-02-24 14:27:56.000000000 +0100
|
||
|
|
@@ -10,6 +10,8 @@
|
||
|
|
***************************************************************************/
|
||
|
|
#include <cstdio>
|
||
|
|
#include <cstdlib>
|
||
|
|
+#include <cstring>
|
||
|
|
+#include <ctime>
|
||
|
|
#include <cmath>
|
||
|
|
#include <cassert>
|
||
|
|
#include <list>
|
||
|
|
diff -Naupr torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
|
||
|
|
--- torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp 2006-11-05 02:42:22.000000000 +0100
|
||
|
|
+++ torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp 2008-02-24 14:19:02.000000000 +0100
|
||
|
|
@@ -32,7 +32,7 @@
|
||
|
|
#include "Transform.h"
|
||
|
|
|
||
|
|
#include <algorithm>
|
||
|
|
-#include <new.h>
|
||
|
|
+#include <new>
|
||
|
|
|
||
|
|
class BBoxCompAxis {
|
||
|
|
public:
|
||
|
|
diff -Naupr torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
|
||
|
|
--- torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp 2006-11-05 02:42:22.000000000 +0100
|
||
|
|
+++ torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp 2008-02-24 14:18:51.000000000 +0100
|
||
|
|
@@ -32,7 +32,7 @@
|
||
|
|
#include "Transform.h"
|
||
|
|
#include "BBoxTree.h"
|
||
|
|
|
||
|
|
-#include <new.h>
|
||
|
|
+#include <new>
|
||
|
|
|
||
|
|
BBoxInternal *free_node;
|
||
|
|
|
||
|
|
diff -Naupr torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
|
||
|
|
--- torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp 2006-11-05 02:42:23.000000000 +0100
|
||
|
|
+++ torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp 2008-02-24 14:19:11.000000000 +0100
|
||
|
|
@@ -32,7 +32,7 @@
|
||
|
|
#include "Object.h"
|
||
|
|
#include "Encounter.h"
|
||
|
|
|
||
|
|
-#include <new.h>
|
||
|
|
+#include <new>
|
||
|
|
|
||
|
|
void addPair(ObjectPtr object1, ObjectPtr object2);
|
||
|
|
void removePair(ObjectPtr object1, ObjectPtr object2);
|
||
|
|
diff -Naupr torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
|
||
|
|
--- torcs-1.3.0.orig/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp 2006-11-05 02:42:23.000000000 +0100
|
||
|
|
+++ torcs-1.3.0/src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp 2008-02-24 14:22:35.000000000 +0100
|
||
|
|
@@ -33,7 +33,7 @@
|
||
|
|
#include "Convex.h"
|
||
|
|
#include "Complex.h"
|
||
|
|
|
||
|
|
-#include <new.h>
|
||
|
|
+#include <new>
|
||
|
|
|
||
|
|
Object::Object(DtObjectRef obj, ShapePtr shape) :
|
||
|
|
ref(obj),
|