From abc556950bd8a9b5dbb12210ddca5bb32830a203 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 12 Nov 2011 12:01:34 +0000 Subject: [PATCH] Unordered: Remove support for TR1 tuples. Fixes #6111. [SVN r75450] --- include/boost/unordered/detail/emplace_args.hpp | 4 ---- include/boost/unordered/detail/extract_key.hpp | 2 -- 2 files changed, 6 deletions(-) diff --git a/include/boost/unordered/detail/emplace_args.hpp b/include/boost/unordered/detail/emplace_args.hpp index 9c1dfd3e..afa3fd31 100644 --- a/include/boost/unordered/detail/emplace_args.hpp +++ b/include/boost/unordered/detail/emplace_args.hpp @@ -26,8 +26,6 @@ #if !defined(BOOST_NO_0X_HDR_TUPLE) #include -#elif defined(BOOST_HAS_TR1_TUPLE) -#include #endif #if defined(BOOST_MSVC) @@ -202,8 +200,6 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost) #if !defined(BOOST_NO_0X_HDR_TUPLE) BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std) -#elif defined(BOOST_HAS_TR1_TUPLE) -BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std::tr1) #endif #undef BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE diff --git a/include/boost/unordered/detail/extract_key.hpp b/include/boost/unordered/detail/extract_key.hpp index 3ac292f0..ab0d0cd0 100644 --- a/include/boost/unordered/detail/extract_key.hpp +++ b/include/boost/unordered/detail/extract_key.hpp @@ -208,8 +208,6 @@ BOOST_UNORDERED_KEY_FROM_TUPLE(boost) #if !defined(BOOST_NO_0X_HDR_TUPLE) BOOST_UNORDERED_KEY_FROM_TUPLE(std) -#elif defined(BOOST_HAS_TR1_TUPLE) -BOOST_UNORDERED_KEY_FROM_TUPLE(std::tr1) #endif