From 1529f909a68e17dc94ea38139f0dbaccf80df503 Mon Sep 17 00:00:00 2001
From: Marshall Clow <marshall@idio.com>
Date: Mon, 18 Mar 2013 20:29:56 +0000
Subject: [PATCH] In c++11, use std:: instead of std::tr1:: stuff

[SVN r83491]
---
 include/boost/algorithm/cxx11/is_permutation.hpp       | 2 --
 include/boost/algorithm/searching/detail/bm_traits.hpp | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/boost/algorithm/cxx11/is_permutation.hpp b/include/boost/algorithm/cxx11/is_permutation.hpp
index 526ca2e..b30166c 100644
--- a/include/boost/algorithm/cxx11/is_permutation.hpp
+++ b/include/boost/algorithm/cxx11/is_permutation.hpp
@@ -21,7 +21,6 @@
 #include <boost/range/end.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/tr1/tr1/tuple>      // for tie
 
 namespace boost { namespace algorithm {
 
@@ -61,7 +60,6 @@ bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
                       ForwardIterator2 first2, BinaryPredicate p )
 {
 //  Skip the common prefix (if any)
-//  std::tie (first1, first2) = std::mismatch (first1, last1, first2, p);
     std::pair<ForwardIterator1, ForwardIterator2> eq = std::mismatch (first1, last1, first2, p);
     first1 = eq.first;
     first2 = eq.second;
diff --git a/include/boost/algorithm/searching/detail/bm_traits.hpp b/include/boost/algorithm/searching/detail/bm_traits.hpp
index ea150c3..9c25540 100755
--- a/include/boost/algorithm/searching/detail/bm_traits.hpp
+++ b/include/boost/algorithm/searching/detail/bm_traits.hpp
@@ -20,7 +20,11 @@
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/array.hpp>
+#ifdef BOOST_NO_CXX11_HDR_UNORDERED_MAP
 #include <boost/tr1/tr1/unordered_map>
+#else
+#include <unordered_map>
+#endif
 
 #include <boost/algorithm/searching/detail/debugging.hpp>
 
@@ -35,7 +39,11 @@ namespace boost { namespace algorithm { namespace detail {
     template<typename key_type, typename value_type>
     class skip_table<key_type, value_type, false> {
     private:
+#ifdef BOOST_NO_CXX11_HDR_UNORDERED_MAP
         typedef std::tr1::unordered_map<key_type, value_type> skip_map;
+#else
+        typedef std::unordered_map<key_type, value_type> skip_map;
+#endif
         const value_type k_default_value;
         skip_map skip_;