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

Fix CMap with clang -std=c++11 

It seems that Boost.Config says std::tuple does not work, even if
variadic templates are usable.

Trivial fix for master.

(cherry picked from commit e60c9ec190611c711fff7bb9a5ffc463f93e31b7)
This commit is contained in:
Laurent Rineau 2014-06-13 20:09:58 +02:00
parent 1a9661e8c5
commit c8540086d8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h
View File

@ -48,7 +48,8 @@ namespace CGAL
struct Convert_void<void>
{ typedef CGAL::Void type; };
#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
#if ! defined(CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES) && \
! defined(CGAL_CFG_NO_CPP0X_TUPLE)
// Convert a tuple in a same tuple where each void type was replaced into
// CGAL::Void.
template<typename ... Items>

2
Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h
View File

@ -20,7 +20,7 @@
#ifndef CGAL_INTERNAL_COMBINATORIAL_MAP_UTILITY_NOVARIADIC_H
#define CGAL_INTERNAL_COMBINATORIAL_MAP_UTILITY_NOVARIADIC_H 1
#ifdef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
#if defined(CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES) || defined(CGAL_CFG_NO_CPP0X_TUPLE)
#include <boost/mpl/if.hpp>
#include <boost/type_traits/is_same.hpp>