summaryrefslogtreecommitdiff
blob: fcc5604e79cc81ff9751d8d78b68ef5319510ab9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp
--- src.old/drivers/olethros/Trajectory.cpp	2008-04-06 22:21:31.000000000 +0200
+++ src/drivers/olethros/Trajectory.cpp	2008-04-06 22:28:52.000000000 +0200
@@ -10,8 +10,10 @@
  ***************************************************************************/
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <cmath>
 #include <cassert>
+#include <ctime>
 #include <list>
 #include <vector>
 #include "Trajectory.h"
diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
--- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:21:31.000000000 +0200
+++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:22:57.000000000 +0200
@@ -32,7 +32,7 @@
 #include "Transform.h"
 
 #include <algorithm>
-#include <new.h>
+#include <new>
 
 class BBoxCompAxis {
 public:
diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
--- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:21:31.000000000 +0200
+++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:23:11.000000000 +0200
@@ -32,7 +32,7 @@
 #include "Transform.h"
 #include "BBoxTree.h"
 
-#include <new.h>
+#include <new>
 
 BBoxInternal *free_node;
 
diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
--- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:21:31.000000000 +0200
+++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:22:29.000000000 +0200
@@ -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 -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
--- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:21:31.000000000 +0200
+++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:22:40.000000000 +0200
@@ -33,7 +33,7 @@
 #include "Convex.h" 
 #include "Complex.h" 
 
-#include <new.h>
+#include <new>
 
 Object::Object(DtObjectRef obj, ShapePtr shape) : 
   ref(obj), 
diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp
--- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:21:31.000000000 +0200
+++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:22:12.000000000 +0200
@@ -37,7 +37,7 @@
 }
 
 #include <vector>
-#include <new.h>  
+#include <new>  
 
 typedef vector<unsigned int> IndexBuf;