Skip to content

Commit 343f892

Browse files
committed
SupportSetFunc: add missing define for windows std::sort
This flag needs to be present at the CMakeLists level, as Eigen is present everywhere in hpp-fcl.
1 parent 51f01a8 commit 343f892

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ IF(WIN32)
225225
Boost::thread
226226
Boost::date_time
227227
)
228+
# There is an issue with MSVC 2017 and Eigen (due to std::aligned_storage).
229+
# See https://github.com/ceres-solver/ceres-solver/issues/481
230+
target_compile_definitions(${LIBRARY_NAME} PRIVATE _ENABLE_EXTENDED_ALIGNED_STORAGE)
228231
ENDIF(WIN32)
229232

230233
if (HPP_FCL_TURN_ASSERT_INTO_EXCEPTION)

src/narrowphase/support_functions.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838

3939
#include "hpp/fcl/narrowphase/support_functions.h"
4040

41+
#include <algorithm>
42+
4143
namespace hpp {
4244
namespace fcl {
4345
namespace details {

0 commit comments

Comments
 (0)