Subject: [Boost-commit] svn:boost r83491 - in trunk/boost/algorithm: cxx11 searching/detail
From: marshall_at_[hidden]
Date: 2013-03-18 16:29:57
Author: marshall
Date: 2013-03-18 16:29:56 EDT (Mon, 18 Mar 2013)
New Revision: 83491
URL: http://svn.boost.org/trac/boost/changeset/83491
Log:
In c++11, use std:: instead of std::tr1:: stuff
Text files modified:
trunk/boost/algorithm/cxx11/is_permutation.hpp | 2 --
trunk/boost/algorithm/searching/detail/bm_traits.hpp | 8 ++++++++
2 files changed, 8 insertions(+), 2 deletions(-)
Modified: trunk/boost/algorithm/cxx11/is_permutation.hpp
==============================================================================
--- trunk/boost/algorithm/cxx11/is_permutation.hpp (original)
+++ trunk/boost/algorithm/cxx11/is_permutation.hpp 2013-03-18 16:29:56 EDT (Mon, 18 Mar 2013)
@@ -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 @@
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;
Modified: trunk/boost/algorithm/searching/detail/bm_traits.hpp
==============================================================================
--- trunk/boost/algorithm/searching/detail/bm_traits.hpp (original)
+++ trunk/boost/algorithm/searching/detail/bm_traits.hpp 2013-03-18 16:29:56 EDT (Mon, 18 Mar 2013)
@@ -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 @@
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_;