songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation for msvc 

in boost.hpp, the macro BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
opens namespace boost { namespace mpl {
before defining struct bool_
This commit is contained in:
Jane Tournois 2020-08-10 11:40:55 +02:00
parent 72925b8a03
commit d9892c23e0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
View File

@ -863,12 +863,12 @@ private :
} }
// internal function to filter split event in case the traits is Filtered // internal function to filter split event in case the traits is Filtered
bool CanSafelyIgnoreSplitEventImpl(const EventPtr& lEvent, const boost::optional<FT>& bound, mpl_::bool_<false>) bool CanSafelyIgnoreSplitEventImpl(const EventPtr& lEvent, const boost::optional<FT>& bound, boost::mpl::bool_<false>)
{ {
return false; return false;
} }
bool CanSafelyIgnoreSplitEventImpl(const EventPtr& lEvent, const boost::optional<FT>& bound, mpl_::bool_<true>) bool CanSafelyIgnoreSplitEventImpl(const EventPtr& lEvent, const boost::optional<FT>& bound, boost::mpl::bool_<true>)
{ {
return Traits::can_safely_ignore_split_event(lEvent, bound); return Traits::can_safely_ignore_split_event(lEvent, bound);
} }
@ -880,7 +880,7 @@ private :
boost::optional<FT> UpperBoundForValidSplitEventsImpl(Vertex_handle, Vertex_handle, Vertex_handle, boost::optional<FT> UpperBoundForValidSplitEventsImpl(Vertex_handle, Vertex_handle, Vertex_handle,
Halfedge_handle_vector_iterator , Halfedge_handle_vector_iterator, Halfedge_handle_vector_iterator , Halfedge_handle_vector_iterator,
mpl_::bool_<false>) boost::mpl::bool_<false>)
{ {
return boost::none; return boost::none;
} }
@ -888,7 +888,7 @@ private :
boost::optional<FT> UpperBoundForValidSplitEventsImpl(Vertex_handle lPrev, Vertex_handle aNode, Vertex_handle lNext, boost::optional<FT> UpperBoundForValidSplitEventsImpl(Vertex_handle lPrev, Vertex_handle aNode, Vertex_handle lNext,
Halfedge_handle_vector_iterator contour_halfedges_begin, Halfedge_handle_vector_iterator contour_halfedges_begin,
Halfedge_handle_vector_iterator contour_halfedges_end, Halfedge_handle_vector_iterator contour_halfedges_end,
mpl_::bool_<true>) boost::mpl::bool_<true>)
{ {
return Traits::upper_bound_for_valid_split_events(lPrev, aNode, lNext, contour_halfedges_begin, contour_halfedges_end); return Traits::upper_bound_for_valid_split_events(lPrev, aNode, lNext, contour_halfedges_begin, contour_halfedges_end);
} }