From c8540086d812b9a313880d06a3c28e148a3f18a6 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Fri, 13 Jun 2014 20:09:58 +0200
Subject: [PATCH] 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)
---
 .../include/CGAL/internal/Combinatorial_map_utility.h          | 3 ++-
 .../CGAL/internal/Combinatorial_map_utility_novariadic.h       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h
index 104e5868e39..19f8c982b37 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h
@@ -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>
diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h
index 6d3f03028bf..43515380db2 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h
@@ -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>