From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 17 Oct 2016 17:03:35 +0000 (+0100)
Subject: Use normal mode containers in searchers
X-Git-Tag: releases/gcc-5.5.0~760
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f940ecad01be4a3b77b2f432d73b1663786889d;p=thirdparty%2Fgcc.git

Use normal mode containers in searchers

Backport from mainline:
2016-10-13  Jonathan Wakely  <jwakely@redhat.com>

	* include/experimental/functional (boyer_moore_searcher)
	(__boyer_moore_map_base, __boyer_moore_array_base): Qualify containers
	with _GLIBCXX_STD_C.

From-SVN: r241267
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d15e381eebbd..efe8181cb340 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2016-10-17  Jonathan Wakely  <jwakely@redhat.com>
+
+	Backport from mainline:
+	2016-10-13  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/experimental/functional (boyer_moore_searcher)
+	(__boyer_moore_map_base, __boyer_moore_array_base): Qualify containers
+	with _GLIBCXX_STD_C.
+
 2016-10-17  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backport from mainline:
diff --git a/libstdc++-v3/include/experimental/functional b/libstdc++-v3/include/experimental/functional
index 0d0ab3713378..dbb91483ddb9 100644
--- a/libstdc++-v3/include/experimental/functional
+++ b/libstdc++-v3/include/experimental/functional
@@ -116,7 +116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _Pred
       _M_pred() const { return _M_bad_char.key_eq(); }
 
-      std::unordered_map<_Key, _Tp, _Hash, _Pred> _M_bad_char;
+      _GLIBCXX_STD_C::unordered_map<_Key, _Tp, _Hash, _Pred> _M_bad_char;
     };
 
   template<typename _Tp, size_t _Len, typename _Pred>
@@ -125,7 +125,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       template<typename _RAIter, typename _Unused>
 	__boyer_moore_array_base(_RAIter __pat, size_t __patlen,
 				 _Unused&&, _Pred&& __pred)
-	: _M_bad_char{ {}, std::move(__pred) }
+	: _M_bad_char{ _GLIBCXX_STD_C::array<_Tp, _Len>{}, std::move(__pred) }
 	{
 	  std::get<0>(_M_bad_char).fill(__patlen);
 	  if (__patlen > 0)
@@ -153,7 +153,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       const _Pred&
       _M_pred() const { return std::get<1>(_M_bad_char); }
 
-      std::tuple<std::array<_Tp, _Len>, _Pred> _M_bad_char;
+      std::tuple<_GLIBCXX_STD_C::array<_Tp, _Len>, _Pred> _M_bad_char;
     };
 
   template<typename _Pred>
@@ -226,7 +226,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       _RAIter _M_pat;
       _RAIter _M_pat_end;
-      std::vector<__diff_type> _M_good_suffix;
+      _GLIBCXX_STD_C::vector<__diff_type> _M_good_suffix;
     };
 
   template<typename _RAIter, typename _Hash