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

Replace <boost/type_traits/is_convertible.hpp> by <type_traits>

This commit is contained in:
Laurent Rineau 2021-01-21 11:19:16 +01:00
parent fa6afe73d1
commit 8e316f63f7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TDS_3/include/CGAL/Triangulation_data_structure_3.h
View File

@ -55,7 +55,6 @@
# include <tbb/scalable_allocator.h>
#endif
#include <boost/type_traits/is_convertible.hpp>
#include <type_traits>
namespace CGAL {
@ -123,9 +122,9 @@ public:
// Cells
// N.B.: Concurrent_compact_container requires TBB
#ifdef CGAL_LINKED_WITH_TBB
typedef typename boost::mpl::if_c
typedef typename std::conditional
<
boost::is_convertible<Concurrency_tag, Parallel_tag>::value,
std::is_convertible<Concurrency_tag, Parallel_tag>::value,
Concurrent_compact_container<Cell, tbb::scalable_allocator<Cell> >,
Compact_container<Cell>
>::type Cell_range;
@ -141,9 +140,9 @@ public:
// Vertices
// N.B.: Concurrent_compact_container requires TBB
#ifdef CGAL_LINKED_WITH_TBB
typedef typename boost::mpl::if_c
typedef typename std::conditional
<
boost::is_convertible<Concurrency_tag, Parallel_tag>::value,
std::is_convertible<Concurrency_tag, Parallel_tag>::value,
Concurrent_compact_container<Vertex, tbb::scalable_allocator<Vertex> >,
Compact_container<Vertex>
>::type Vertex_range;