diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable_policy.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/unordered_set/insert/move_range.cc | 51 |
3 files changed, 58 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 983ff967cb7..1048d2877ff 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2013-04-26 François Dumont <fdumont@gcc.gnu.org> + + * include/bits/hashtable_policy.h + (_Insert_base<>::insert<_It>(_It, _It)): Enable move semantics. + * testsuite/23_containers/unordered_set/insert/move_range.cc: New. + 2013-04-26 Paolo Carlini <paolo.carlini@oracle.com> * include/c_global/cstdio (gets): Provide only in C++98 and C++11. diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index 5cabb53bb6d..1cf6cb2ec53 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -665,7 +665,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __h._M_rehash(__do_rehash.second, __saved_state); for (; __first != __last; ++__first) - this->insert(*__first); + __h._M_insert(*__first, __unique_keys()); } /** diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/move_range.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/move_range.cc new file mode 100644 index 00000000000..eb1e0d82c3d --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/move_range.cc @@ -0,0 +1,51 @@ +// { dg-options "-std=c++11" } + +// Copyright (C) 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// range insert using move iterator + +#include <iterator> +#include <vector> +#include <unordered_set> +#include <testsuite_hooks.h> +#include <testsuite_counter_type.h> + +bool test __attribute__((unused)) = true; + +void test01() +{ + using namespace __gnu_test; + + std::vector<counter_type> ref = { 0, 1, 2, 3, 4, 5 }; + typedef std::unordered_set<counter_type, counter_type_hasher> Set; + Set s; + + counter_type::reset(); + + s.insert(std::make_move_iterator(ref.begin()), + std::make_move_iterator(ref.end())); + + VERIFY( s.size() == ref.size() ); + VERIFY( counter_type::move_count == ref.size() ); +} + +int main() +{ + test01(); + return 0; +} |