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
This commit is contained in:
parent
3a9b4dbe3d
commit
12742e536b
6 changed files with 32 additions and 5 deletions
|
@ -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>
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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) :
|
||||
|
|
Loading…
Reference in a new issue