diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-19 18:08:32 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-19 18:08:32 (GMT) |
| commit | c6eeb1a1c5da072e1c0a77d30892e4ee95ed9bde (patch) | |
| tree | e5513fae2b6fbef7e974771eeb6deeba6e34f2a6 /src/CGALEvaluator.cc | |
| parent | ee26d60a8b274afcdad7538bd8b2e9fb8d53f8bd (diff) | |
| parent | c1d5e82b4365bf9d0563e1c5927a99d3def91832 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'src/CGALEvaluator.cc')
| -rw-r--r-- | src/CGALEvaluator.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc index 1b307be..ee04e05 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -34,8 +34,8 @@ #include <assert.h> #include <boost/foreach.hpp> -#include <boost/unordered_map.hpp> #include <boost/bind.hpp> +#include <map> CGAL_Nef_polyhedron CGALEvaluator::evaluateCGALMesh(const AbstractNode &node) { @@ -445,9 +445,9 @@ CGAL_Nef_polyhedron CGALEvaluator::evaluateCGALMesh(const PolySet &ps) struct PolyReducer { Grid2d<int> grid; - boost::unordered_map<std::pair<int,int>, std::pair<int,int> > edge_to_poly; - boost::unordered_map<int, CGAL_Nef_polyhedron2::Point> points; - typedef boost::unordered_map<int, std::vector<int> > PolygonMap; + std::map<std::pair<int,int>, std::pair<int,int> > edge_to_poly; + std::map<int, CGAL_Nef_polyhedron2::Point> points; + typedef std::map<int, std::vector<int> > PolygonMap; PolygonMap polygons; int poly_n; |