diff options
| author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2017-08-12 19:09:40 +0000 |
|---|---|---|
| committer | Edward Smith-Rowland <3dw4rd@verizon.net> | 2017-08-12 19:09:40 +0000 |
| commit | 40fa8ee5f9da161462fde48776ef6262366f9a13 (patch) | |
| tree | d3c3bf913950c59ef83b8d9ede50b0978ec0c12f /libstdc++-v3/include/experimental/set | |
| parent | 3acaf2e51caf356a9afc763cfd70b91d1ab094b5 (diff) | |
Merged revisions r232323 through r251067 to the branchtr29124
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tr29124@251068 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/experimental/set')
| -rw-r--r-- | libstdc++-v3/include/experimental/set | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/libstdc++-v3/include/experimental/set b/libstdc++-v3/include/experimental/set index a10617bb2a9..fba136c90c5 100644 --- a/libstdc++-v3/include/experimental/set +++ b/libstdc++-v3/include/experimental/set @@ -41,12 +41,12 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace experimental { inline namespace fundamentals_v2 { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - template<typename _Key, typename _Compare, typename _Alloc, typename _Predicate> inline void @@ -59,23 +59,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION erase_if(multiset<_Key, _Compare, _Alloc>& __cont, _Predicate __pred) { __detail::__erase_nodes_if(__cont, __pred); } -_GLIBCXX_END_NAMESPACE_VERSION - -namespace pmr { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - - template<typename _Key, typename _Compare = less<_Key>> - using set = std::set<_Key, _Compare, polymorphic_allocator<_Key>>; - - template<typename _Key, typename _Compare = less<_Key>> - using multiset = std::multiset<_Key, _Compare, - polymorphic_allocator<_Key>>; + namespace pmr { + template<typename _Key, typename _Compare = less<_Key>> + using set = std::set<_Key, _Compare, polymorphic_allocator<_Key>>; -_GLIBCXX_END_NAMESPACE_VERSION -} // namespace pmr + template<typename _Key, typename _Compare = less<_Key>> + using multiset = std::multiset<_Key, _Compare, + polymorphic_allocator<_Key>>; + } // namespace pmr } // namespace fundamentals_v2 } // namespace experimental + +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // C++14 |