Skip to content

Commit

Permalink
fix missing algorithm imports under some compilation schemes.
Browse files Browse the repository at this point in the history
  • Loading branch information
ngodber committed Jun 29, 2021
1 parent 038eecc commit ba91c23
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 7 deletions.
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ set(HAVE_LIBSTDCPP_UNORDERED_COLLECTIONS FALSE)

set(HAVE_BOOST_UNORDERED_COLLECTIONS FALSE)

find_package(Boost 1.40)
include_directories(${Boost_INCLUDE_DIRS})


if(CARVE_BOOST_COLLECTIONS)
set(HAVE_BOOST_UNORDERED_COLLECTIONS TRUE)
find_package(Boost 1.40)
include_directories(${Boost_INCLUDE_DIRS})
set(HAVE_BOOST_UNORDERED_COLLECTIONS TRUE)

else(CARVE_BOOST_COLLECTIONS)
# attempt to work out which unordered collection implementation we can use
Expand Down
2 changes: 1 addition & 1 deletion include/carve/mesh_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <carve/geom2d.hpp>
#include <carve/geom3d.hpp>
#include <carve/djset.hpp>

#include <algorithm>
#include <iostream>
#include <deque>

Expand Down
1 change: 1 addition & 0 deletions include/carve/polyhedron_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#pragma once

#include <carve/timing.hpp>
#include <algorithm>

#include <assert.h>
#include <list>
Expand Down
2 changes: 1 addition & 1 deletion include/carve/rtree.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <carve/aabb.hpp>

#include <iostream>

#include <algorithm>
#include <cmath>
#include <limits>

Expand Down
2 changes: 1 addition & 1 deletion include/carve/vector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <carve/geom3d.hpp>

#include <sstream>

#include <algorithm>
#include <math.h>

namespace carve {
Expand Down
2 changes: 1 addition & 1 deletion lib/mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <carve/mesh.hpp>
#include <carve/mesh_impl.hpp>
#include <carve/rtree.hpp>

#include <algorithm>
#include <carve/poly.hpp>

namespace {
Expand Down
1 change: 1 addition & 0 deletions lib/pointset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include <carve/geom.hpp>
#include <carve/pointset.hpp>
#include <algorithm>

namespace carve {
namespace point {
Expand Down
1 change: 1 addition & 0 deletions lib/polyline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <carve/geom.hpp>
#include <carve/vector.hpp>
#include <carve/polyline.hpp>
#include <algorithm>

namespace carve {
namespace line {
Expand Down

0 comments on commit ba91c23

Please sign in to comment.