re PR libstdc++/56278 (unordered containers fail static assertion)
PR libstdc++/56278 * include/bits/hashtable_policy.h (_Hash_code_base): Make default constructor public. * testsuite/23_containers/unordered_set/56278.cc: New. From-SVN: r195935
This commit is contained in:
parent
9a147b39c6
commit
a9b68b8289
|
@ -1,3 +1,10 @@
|
||||||
|
2013-02-10 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
|
|
||||||
|
PR libstdc++/56278
|
||||||
|
* include/bits/hashtable_policy.h (_Hash_code_base): Make default
|
||||||
|
constructor public.
|
||||||
|
* testsuite/23_containers/unordered_set/56278.cc: New.
|
||||||
|
|
||||||
2013-02-09 François Dumont <fdumont@gcc.gnu.org>
|
2013-02-09 François Dumont <fdumont@gcc.gnu.org>
|
||||||
|
|
||||||
* include/tr1/bessel_function.tcc (__cyl_bessel_ij_series): Code
|
* include/tr1/bessel_function.tcc (__cyl_bessel_ij_series): Code
|
||||||
|
|
|
@ -918,13 +918,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
using __ebo_extract_key = _Hashtable_ebo_helper<0, _ExtractKey>;
|
using __ebo_extract_key = _Hashtable_ebo_helper<0, _ExtractKey>;
|
||||||
using __ebo_hash = _Hashtable_ebo_helper<1, _Hash>;
|
using __ebo_hash = _Hashtable_ebo_helper<1, _Hash>;
|
||||||
|
|
||||||
|
public:
|
||||||
|
// We need the default constructor for the local iterators.
|
||||||
|
_Hash_code_base() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
typedef void* __hash_code;
|
typedef void* __hash_code;
|
||||||
typedef _Hash_node<_Value, false> __node_type;
|
typedef _Hash_node<_Value, false> __node_type;
|
||||||
|
|
||||||
// We need the default constructor for the local iterators.
|
protected:
|
||||||
_Hash_code_base() = default;
|
|
||||||
|
|
||||||
_Hash_code_base(const _ExtractKey& __ex, const _H1&, const _H2&,
|
_Hash_code_base(const _ExtractKey& __ex, const _H1&, const _H2&,
|
||||||
const _Hash& __h)
|
const _Hash& __h)
|
||||||
: __ebo_extract_key(__ex), __ebo_hash(__h) { }
|
: __ebo_extract_key(__ex), __ebo_hash(__h) { }
|
||||||
|
@ -956,7 +958,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
std::swap(_M_ranged_hash(), __x._M_ranged_hash());
|
std::swap(_M_ranged_hash(), __x._M_ranged_hash());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
|
||||||
const _ExtractKey&
|
const _ExtractKey&
|
||||||
_M_extract() const { return __ebo_extract_key::_S_cget(*this); }
|
_M_extract() const { return __ebo_extract_key::_S_cget(*this); }
|
||||||
|
|
||||||
|
@ -1003,13 +1004,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
hash_function() const
|
hash_function() const
|
||||||
{ return _M_h1(); }
|
{ return _M_h1(); }
|
||||||
|
|
||||||
|
// We need the default constructor for the local iterators.
|
||||||
|
_Hash_code_base() = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
typedef std::size_t __hash_code;
|
typedef std::size_t __hash_code;
|
||||||
typedef _Hash_node<_Value, false> __node_type;
|
typedef _Hash_node<_Value, false> __node_type;
|
||||||
|
|
||||||
// We need the default constructor for the local iterators.
|
|
||||||
_Hash_code_base() = default;
|
|
||||||
|
|
||||||
_Hash_code_base(const _ExtractKey& __ex,
|
_Hash_code_base(const _ExtractKey& __ex,
|
||||||
const _H1& __h1, const _H2& __h2,
|
const _H1& __h1, const _H2& __h2,
|
||||||
const _Default_ranged_hash&)
|
const _Default_ranged_hash&)
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
// { dg-options "-std=gnu++0x" }
|
||||||
|
// { dg-do compile }
|
||||||
|
|
||||||
|
// 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/>.
|
||||||
|
|
||||||
|
// libstdc++/56278
|
||||||
|
|
||||||
|
#include <unordered_set>
|
||||||
|
|
||||||
|
struct hash : std::hash<int>
|
||||||
|
{
|
||||||
|
hash() { }
|
||||||
|
};
|
||||||
|
|
||||||
|
std::unordered_set<int, hash>::local_iterator i;
|
Loading…
Reference in New Issue