re PR libstdc++/66055 (hash containers missing required reserving constructors)

2015-05-14  Nathan Myers  <ncm@cantrip.org>
	    Jonathan Wakely  <jwakely@redhat.com>

	PR libstdc++/66055
	* include/std/unordered_map (unordered_map, unordered_multimap): Add
	missing constructors.
	* include/std/unordered_set (unordered_set, unordered_multiset):
	Likewise.
	* testsuite/23_containers/unordered_map/cons/66055.cc: New.
	* testsuite/23_containers/unordered_multimap/cons/66055.cc: New.
	* testsuite/23_containers/unordered_multiset/cons/66055.cc: New.
	* testsuite/23_containers/unordered_set/cons/66055.cc: New.

Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>
From-SVN: r223198

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4e38fbfe93f1a9af01ce2a614d6b8aad8188a300..2311e9345037d7785dfea58f87f299d6192c65c9 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,16 @@
+2015-05-14  Nathan Myers  <ncm@cantrip.org>
+           Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/66055
+       * include/std/unordered_map (unordered_map, unordered_multimap): Add
+       missing constructors.
+       * include/std/unordered_set (unordered_set, unordered_multiset):
+       Likewise.
+       * testsuite/23_containers/unordered_map/cons/66055.cc: New.
+       * testsuite/23_containers/unordered_multimap/cons/66055.cc: New.
+       * testsuite/23_containers/unordered_multiset/cons/66055.cc: New.
+       * testsuite/23_containers/unordered_set/cons/66055.cc: New.
+
 2015-05-14  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/66011

diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h
index 92b75d1dfc751d63e6b081c0372f38d4626d3504..069b85922ead045bf18bb18a9bff605e6b4eea6e 100644 (file)
--- a/libstdc++-v3/include/bits/unordered_map.h
+++ b/libstdc++-v3/include/bits/unordered_map.h
@@ -146,6 +146,17 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       : _M_h(__n, __hf, __eql, __a)
       { }
 
+      unordered_map(size_type __n, const allocator_type& __a)
+      : _M_h(__n, hasher(), key_equal(), __a)
+      { }
+
+      explicit
+      unordered_map(size_type __n,
+                   const hasher& __hf,
+                   const allocator_type& __a)
+      : _M_h(__n, __hf, key_equal(), __a)
+      { }
+
       /**
        *  @brief  Builds an %unordered_map from a range.
        *  @param  __first  An input iterator.
@@ -861,6 +872,16 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       : _M_h(__n, __hf, __eql, __a)
       { }
 
+      unordered_multimap(size_type __n, const allocator_type& __a)
+      : _M_h(__n, hasher(), key_equal(), __a)
+      { }
+
+      unordered_multimap(size_type __n,
+                        const hasher& __hf,
+                        const allocator_type& __a)
+      : _M_h(__n, __hf, key_equal(), __a)
+      { }
+
       /**
        *  @brief  Builds an %unordered_multimap from a range.
        *  @param  __first An input iterator.

diff --git a/libstdc++-v3/include/bits/unordered_set.h b/libstdc++-v3/include/bits/unordered_set.h
index 7a2546c82576f66602583638fd061e88627b1ccc..c91eab8e113b14ccee07ccf7c8cb7f398468efd2 100644 (file)
--- a/libstdc++-v3/include/bits/unordered_set.h
+++ b/libstdc++-v3/include/bits/unordered_set.h
@@ -140,6 +140,16 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       : _M_h(__n, __hf, __eql, __a)
       { }
 
+      unordered_set(size_type __n, const allocator_type& __a)
+      : _M_h(__n, hasher(), key_equal(), __a)
+      { }
+
+      unordered_set(size_type __n,
+                    const hasher& __hf,
+                    const allocator_type& __a)
+      : unordered_set(__n, __hf, key_equal(), __a)
+      { }
+
       /**
        *  @brief  Builds an %unordered_set from a range.
        *  @param  __first  An input iterator.
@@ -779,6 +789,16 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       : _M_h(__n, __hf, __eql, __a)
       { }
 
+      unordered_multiset(size_type __n, const allocator_type& __a)
+      : _M_h(__n, hasher(), key_equal(), __a)
+      { }
+
+      unordered_multiset(size_type __n,
+                        const hasher& __hf,
+                        const allocator_type& __a)
+      : _M_h(__n, __hf, key_equal(), __a)
+      { }
+
       /**
        *  @brief  Builds an %unordered_multiset from a range.
        *  @param  __first  An input iterator.

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/cons/66055.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/cons/66055.cc
new file mode 100644 (file)
index 0000000..0d3e384
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/cons/66055.cc
@@ -0,0 +1,30 @@
+// Copyright (C) 2015 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/>.
+
+// Jonathan Wakely  <jwakely@redhat.com>
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <unordered_map>
+
+using test_type = std::unordered_map<int, int>;
+using hasher_type = test_type::hasher;
+using alloc_type = test_type::allocator_type;
+
+test_type h1(10, alloc_type());
+test_type h2(10, hasher_type(), alloc_type());

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/66055.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/66055.cc
new file mode 100644 (file)
index 0000000..c4d68ec
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/66055.cc
@@ -0,0 +1,30 @@
+// Copyright (C) 2015 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/>.
+
+// Jonathan Wakely  <jwakely@redhat.com>
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <unordered_map>
+
+using test_type = std::unordered_multimap<int, int>;
+using hasher_type = test_type::hasher;
+using alloc_type = test_type::allocator_type;
+
+test_type h1(10, alloc_type());
+test_type h2(10, hasher_type(), alloc_type());

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/66055.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/66055.cc
new file mode 100644 (file)
index 0000000..0680951
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/66055.cc
@@ -0,0 +1,30 @@
+// Copyright (C) 2015 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/>.
+
+// Jonathan Wakely  <jwakely@redhat.com>
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <unordered_set>
+
+using test_type = std::unordered_multiset<int>;
+using hasher_type = test_type::hasher;
+using alloc_type = test_type::allocator_type;
+
+test_type h1(10, alloc_type());
+test_type h2(10, hasher_type(), alloc_type());

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/cons/66055.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/cons/66055.cc
new file mode 100644 (file)
index 0000000..2ead0b1
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/cons/66055.cc
@@ -0,0 +1,30 @@
+// Copyright (C) 2015 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/>.
+
+// Jonathan Wakely  <jwakely@redhat.com>
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <unordered_set>
+
+using test_type = std::unordered_set<int>;
+using hasher_type = test_type::hasher;
+using alloc_type = test_type::allocator_type;
+
+test_type h1(10, alloc_type());
+test_type h2(10, hasher_type(), alloc_type());