diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
| commit | 2c90eaa189cd5bc96ef56e89f2841d36f54d0ae2 (patch) | |
| tree | 9f732cf3913312bfb99dc79253bef906864c34b5 /src/dxftess-cgal.cc | |
| parent | 750f3c8fc94744d6cc4c62de6ac86595cb2b38b6 (diff) | |
| parent | bb0ec94290733835df0716531c30460fc5b5210a (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
tests/CMakeLists.txt
tests/csgtestcore.cc
Diffstat (limited to 'src/dxftess-cgal.cc')
| -rw-r--r-- | src/dxftess-cgal.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/dxftess-cgal.cc b/src/dxftess-cgal.cc index cf5b75d..5b4e953 100644 --- a/src/dxftess-cgal.cc +++ b/src/dxftess-cgal.cc @@ -3,15 +3,22 @@ #include "dxfdata.h" #include "polyset.h" #include "grid.h" +#include "cgal.h" +#ifdef NDEBUG +#define PREV_NDEBUG NDEBUG +#undef NDEBUG +#endif #include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Delaunay_mesher_2.h> #include <CGAL/Delaunay_mesher_no_edge_refinement_2.h> #include <CGAL/Delaunay_mesh_face_base_2.h> #include <CGAL/Delaunay_mesh_criteria_2.h> -#include <CGAL/assertions_behaviour.h> -#include <CGAL/exceptions.h> +#include <CGAL/Mesh_2/Face_badness.h> +#ifdef PREV_NDEBUG +#define NDEBUG PREV_NDEBUG +#endif typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Triangulation_vertex_base_2<K> Vb; @@ -23,8 +30,6 @@ typedef CGAL::Constrained_Delaunay_triangulation_2<K, Tds> CDT; typedef CDT::Vertex_handle Vertex_handle; typedef CDT::Point CDTPoint; -#include <CGAL/Mesh_2/Face_badness.h> - #include <boost/unordered_map.hpp> template <class T> class DummyCriteria { |