diff options
Diffstat (limited to 'libstdc++-v3/include/profile/unordered_set')
| -rw-r--r-- | libstdc++-v3/include/profile/unordered_set | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/libstdc++-v3/include/profile/unordered_set b/libstdc++-v3/include/profile/unordered_set index 43dd15a5fc2..6c2dd77cb5f 100644 --- a/libstdc++-v3/include/profile/unordered_set +++ b/libstdc++-v3/include/profile/unordered_set @@ -1,7 +1,6 @@ // Profiling unordered_set/unordered_multiset implementation -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2007 -// Free Software Foundation, Inc. +// Copyright (C) 2009 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -52,6 +51,7 @@ namespace std { namespace __profile { + /** @brief Unordered_set wrapper with performance instrumentation. */ template<typename _Key, typename _Hash = std::hash<_Key>, typename _Pred = std::equal_to<_Key>, @@ -131,8 +131,8 @@ namespace __profile operator=(unordered_set&& __x) { // NB: DR 675. - clear(); - swap(__x); + this->clear(); + this->swap(__x); return *this; } @@ -152,7 +152,7 @@ namespace __profile } void - swap(unordered_set&& __x) + swap(unordered_set& __x) { _Base::swap(__x); } @@ -260,23 +260,12 @@ namespace __profile unordered_set<_Value, _Hash, _Pred, _Alloc>& __y) { __x.swap(__y); } - template<typename _Value, typename _Hash, typename _Pred, typename _Alloc> - inline void - swap(unordered_set<_Value, _Hash, _Pred, _Alloc>&& __x, - unordered_set<_Value, _Hash, _Pred, _Alloc>& __y) - { __x.swap(__y); } - - template<typename _Value, typename _Hash, typename _Pred, typename _Alloc> - inline void - swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x, - unordered_set<_Value, _Hash, _Pred, _Alloc>&& __y) - { __x.swap(__y); } - #undef _GLIBCXX_BASE #undef _GLIBCXX_STD_BASE #define _GLIBCXX_STD_BASE _GLIBCXX_STD_PR::_GLIBCXX_BASE #define _GLIBCXX_BASE unordered_multiset<_Value, _Hash, _Pred, _Alloc> + /** @brief Unordered_multiset wrapper with performance instrumentation. */ template<typename _Value, typename _Hash = std::hash<_Value>, typename _Pred = std::equal_to<_Value>, @@ -352,8 +341,8 @@ namespace __profile operator=(unordered_multiset&& __x) { // NB: DR 675. - clear(); - swap(__x); + this->clear(); + this->swap(__x); return *this; } @@ -373,7 +362,7 @@ namespace __profile } void - swap(unordered_multiset&& __x) + swap(unordered_multiset& __x) { _Base::swap(__x); } @@ -482,18 +471,6 @@ namespace __profile unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y) { __x.swap(__y); } - template<typename _Value, typename _Hash, typename _Pred, typename _Alloc> - inline void - swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>&& __x, - unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y) - { __x.swap(__y); } - - template<typename _Value, typename _Hash, typename _Pred, typename _Alloc> - inline void - swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x, - unordered_multiset<_Value, _Hash, _Pred, _Alloc>&& __y) - { __x.swap(__y); } - } // namespace __profile } // namespace std |