diff options
| author | Marius Kintel <marius@kintel.net> | 2012-08-18 16:28:39 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-08-18 16:28:39 (GMT) |
| commit | d3a53dd546358da51f15fa2fb7d24919235d3256 (patch) | |
| tree | 2b8aae821ded9a6afd713ce9814270fdf6e1667b /src/CGALEvaluator.cc | |
| parent | d87dd4821561fffec4d875a7f584fc25100b8d75 (diff) | |
| parent | 42043dd97d8902c50dbd0b4ed4bde22b0104c88c (diff) | |
Merge pull request #178 from openscad/issue177
maintain order of polygons in evaluateCGALMesh to fix issue 177. add opt...
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; |