diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-16 09:20:34 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-16 09:20:34 +0000 |
| commit | 17ae7f11546e1ce8bec4e4ec71ccb59891ad19cc (patch) | |
| tree | 09d17ad81858e565dc037a69cf4b591e41101256 /libstdc++-v3/include/debug/unordered_set | |
| parent | 31fd081da3d7a8b1184013bf5f9ad06e1ee02462 (diff) | |
| download | ppe42-gcc-17ae7f11546e1ce8bec4e4ec71ccb59891ad19cc.tar.gz ppe42-gcc-17ae7f11546e1ce8bec4e4ec71ccb59891ad19cc.zip | |
PR libstdc++/55043
* include/std/unordered_map: Include alloc_traits.h
* include/std/unordered_set: Likewise.
* include/bits/alloc_traits.h: Define __is_copy_insertable.
* include/bits/unordered_map.h: Use it.
* include/bits/unordered_set.h: Likewise.
* include/debug/unordered_map.h: Likewise.
* include/debug/unordered_set.h: Likewise.
* include/profile/unordered_map.h: Likewise.
* include/profile/unordered_set.h: Likewise.
* include/bits/hashtable.h: Fix comment typos.
* testsuite/23_containers/unordered_map/55043.cc: New.
* testsuite/23_containers/unordered_multimap/55043.cc: New.
* testsuite/23_containers/unordered_multiset/55043.cc: New.
* testsuite/23_containers/unordered_set/55043.cc: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195231 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug/unordered_set')
| -rw-r--r-- | libstdc++-v3/include/debug/unordered_set | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/libstdc++-v3/include/debug/unordered_set b/libstdc++-v3/include/debug/unordered_set index d270ecc96d3..895c9439f6e 100644 --- a/libstdc++-v3/include/debug/unordered_set +++ b/libstdc++-v3/include/debug/unordered_set @@ -1,7 +1,6 @@ // Debugging unordered_set/unordered_multiset implementation -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -// Free Software Foundation, Inc. +// Copyright (C) 2003-2013 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 @@ -921,6 +920,27 @@ namespace __debug { return !(__x == __y); } } // namespace __debug + +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template<typename _Key, typename _Hash, typename _Pred, typename _Alloc> + struct + is_copy_constructible<__debug::unordered_set<_Key, _Hash, _Pred, _Alloc>> + : is_copy_constructible< _GLIBCXX_STD_C::unordered_set<_Key, + _Hash, _Pred, + _Alloc> > + { }; + + template<typename _Key, typename _Hash, typename _Pred, typename _Alloc> + struct + is_copy_constructible<__debug::unordered_multiset<_Key, _Hash, _Pred, + _Alloc>> + : is_copy_constructible< _GLIBCXX_STD_C::unordered_multiset<_Key, + _Hash, _Pred, + _Alloc> > + { }; + +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // C++11 |
