Skip to content

R
riscv-gcc-1
Commit 5117a23e by Jonathan Wakely Committed by Jonathan Wakely
Options

Use normal mode containers in searchers 

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

From-SVN: r241126
parent 2d4035dc
Showing with 13 additions and 8 deletions
libstdc++-v3/ChangeLog
2016-10-13 Jonathan Wakely <jwakely@redhat.com>
* include/experiumental/functional (boyer_moore_searcher)
(__boyer_moore_map_base, __boyer_moore_array_base): Qualify containers
with _GLIBCXX_STD_C.
* include/std/functional: Likewise.
* include/std/chrono (floor): Replace non-constexpr operation.
* testsuite/20_util/duration_cast/rounding.cc: Test conversion to
durations with floating pointer representations.
......
libstdc++-v3/include/experimental/functional
......@@ -119,7 +119,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>
......@@ -128,7 +128,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::array<_Tp, _Len>{}, 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)
......@@ -156,7 +156,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>
......@@ -229,7 +229,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
......
libstdc++-v3/include/std/functional
......@@ -2206,7 +2206,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
_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>
......@@ -2215,7 +2215,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
template<typename _RAIter, typename _Unused>
__boyer_moore_array_base(_RAIter __pat, size_t __patlen,
_Unused&&, _Pred&& __pred)
: _M_bad_char{ std::array<_Tp, _Len>{}, 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)
......@@ -2243,7 +2243,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
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>
......@@ -2316,7 +2316,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
_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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment