summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-08-24 20:25:15 (GMT)
committerMarius Kintel <marius@kintel.net>2011-08-24 20:25:15 (GMT)
commit3c87c07318d6bb854f15f3c44e0bbbbb605e5dd3 (patch)
treeea292df448038ce9cc4dad4009fcf4ce4d7250d5
parent428d5bfc0e8684d6cf8116d0a580b36281135a45 (diff)
compile fixes for older versions of CGAL + newer versions of gcc
-rw-r--r--src/cgal.cc5
-rw-r--r--src/cgal.h2
-rw-r--r--src/node.h1
-rw-r--r--src/state.h2
4 files changed, 8 insertions, 2 deletions
diff --git a/src/cgal.cc b/src/cgal.cc
index ad33a3e..190ebd0 100644
--- a/src/cgal.cc
+++ b/src/cgal.cc
@@ -3,8 +3,11 @@
/*!
Creates a new PolySet and initializes it with the data from this polyhedron
+
+ This method is not const since convert_to_Polyhedron() wasn't const
+ in earlier versions of CGAL.
*/
-PolySet *CGAL_Nef_polyhedron::convertToPolyset() const
+PolySet *CGAL_Nef_polyhedron::convertToPolyset()
{
PolySet *ps = new PolySet();
CGAL_Polyhedron P;
diff --git a/src/cgal.h b/src/cgal.h
index 9ccc4df..911ee55 100644
--- a/src/cgal.h
+++ b/src/cgal.h
@@ -95,7 +95,7 @@ struct CGAL_Nef_polyhedron
return 0;
}
- class PolySet *convertToPolyset() const;
+ class PolySet *convertToPolyset();
};
#endif /* ENABLE_CGAL */
diff --git a/src/node.h b/src/node.h
index a8072da..a3e1cad 100644
--- a/src/node.h
+++ b/src/node.h
@@ -2,6 +2,7 @@
#define NODE_H_
#include <vector>
+#include <string>
#include "traverser.h"
diff --git a/src/state.h b/src/state.h
index ae25c0f..c81575a 100644
--- a/src/state.h
+++ b/src/state.h
@@ -1,6 +1,8 @@
#ifndef STATE_H_
#define STATE_H_
+#include <cstring>
+
class State
{
public:
contact: Jan Huwald // Impressum