r182423 - in /branches/google/gcc-4_6: ./ gcc/c...

[jyasskin at gcc dot gnu dot org]

Author: jyasskin
Date: Sat Dec 17 00:02:19 2011
New Revision: 182423

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=182423
Log:
Merge r182392 to google/gcc-4_6 to get better error messages (compiler
instead of linker) when someone fails to specialize std::hash for
their type.  Also merge r181473 to avoid conflicts.

------------------------------------------------------------------------
r181473 | paolo | 2011-11-18 04:37:06 -0800 (Fri, 18 Nov 2011) | 35 lines

2011-11-18  Paolo Carlini  <paolo.carlini@oracle.com>

	* src/hash-long-double-aux.cc: Rename to...
	* src/hash-long-double-tr1-aux.cc: ... this.
	* src/compatibility-ldbl.cc: Adjust.
	* src/hash_tr1.cc: Likewise.
	* src/hash_c++0x.cc: Don't use src/hash-long-double-aux.cc.
	* include/bits/functional_hash.h (hash<_Tp*>::operator(), specs
	for integer types, hash<float>::operator(), hash<double>::operator(),
	hash<long double>::operator()): Declare noexcept.
	* include/debug/bitset (hash<__debug::bitset>::operator()): Likewise.
	* include/debug/vector (hash<__debug::vector>::operator()): Likewise.
	* include/std/system_error (hash<error_code>::operator()): Likewise.
	* include/std/thread (hash<thread::id>::operator()): Likewise.
	* include/std/bitset (hash<bitset>::operator()): Likewise.
	* include/std/typeindex (hash<type_index>::operator()): Likewise.
	* include/profile/bitset (hash<__profile::vector>::operator()):
	Likewise.
	* include/profile/vector (hash<__profile::vector>::operator()):
	Likewise.
	* include/ext/vstring.h (hash<__vstring>::operator(),
	hash<__wvstring>::operator(), hash<__u16vstring>::operator(),
	hash<__u32vstring>::operator()): Likewise.
	* include/bits/shared_ptr.h (hash<shared_ptr>::operator()): Likewise.
	* include/bits/shared_ptr_base.h (hash<__shared_ptr>::operator()):
	Likewise.
	* include/bits/unique_ptr.h (hash<unique_ptr>::operator()): Likewise.
	* include/bits/basic_string.h (hash<string>::operator(),
	hash<wstring>::operator(), hash<u16string>::operator(),
	hash<u32string>::operator()): Likewise.
	* include/bits/vector.tcc (hash<vector>::operator()): Likewise.
	* include/bits/stl_bvector.h (hash<vector>::operator()): Likewise.
	* libsupc++/typeinfo (type_info::hash_code): Use noexcept instead of
	throw().

------------------------------------------------------------------------
r182392 | paolo | 2011-12-15 14:15:21 -0800 (Thu, 15 Dec 2011) | 11 lines

2011-12-15  Paolo Carlini  <paolo.carlini@oracle.com>
	    Jonathan Wakely  <jwakely.gcc@gmail.com>

	* include/bits/functional_hash.h (struct hash): Add static_assert.
	* src/compatibility-c++0x.cc: Adjust compatibility definitions.
	* testsuite/23_containers/unordered_map/erase/51142.cc: Adjust.
	* testsuite/23_containers/unordered_set/erase/51142.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/erase/51142.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/erase/51142.cc: Likewise.


Added:
    branches/google/gcc-4_6/libstdc++-v3/src/hash-long-double-tr1-aux.cc
      - copied unchanged from r181473, trunk/libstdc++-v3/src/hash-long-double-tr1-aux.cc
Removed:
    branches/google/gcc-4_6/libstdc++-v3/src/hash-long-double-aux.cc
Modified:
    branches/google/gcc-4_6/libstdc++-v3/ChangeLog.google-4_6
    branches/google/gcc-4_6/libstdc++-v3/include/bits/basic_string.h
    branches/google/gcc-4_6/libstdc++-v3/include/bits/functional_hash.h
    branches/google/gcc-4_6/libstdc++-v3/include/bits/shared_ptr.h
    branches/google/gcc-4_6/libstdc++-v3/include/bits/shared_ptr_base.h
    branches/google/gcc-4_6/libstdc++-v3/include/bits/stl_bvector.h
    branches/google/gcc-4_6/libstdc++-v3/include/bits/unique_ptr.h
    branches/google/gcc-4_6/libstdc++-v3/include/bits/vector.tcc
    branches/google/gcc-4_6/libstdc++-v3/include/debug/bitset
    branches/google/gcc-4_6/libstdc++-v3/include/debug/vector
    branches/google/gcc-4_6/libstdc++-v3/include/ext/vstring.h
    branches/google/gcc-4_6/libstdc++-v3/include/profile/bitset
    branches/google/gcc-4_6/libstdc++-v3/include/profile/vector
    branches/google/gcc-4_6/libstdc++-v3/include/std/bitset
    branches/google/gcc-4_6/libstdc++-v3/include/std/system_error
    branches/google/gcc-4_6/libstdc++-v3/include/std/thread
    branches/google/gcc-4_6/libstdc++-v3/include/std/typeindex
    branches/google/gcc-4_6/libstdc++-v3/libsupc++/typeinfo
    branches/google/gcc-4_6/libstdc++-v3/src/compatibility-c++0x.cc
    branches/google/gcc-4_6/libstdc++-v3/src/compatibility-ldbl.cc
    branches/google/gcc-4_6/libstdc++-v3/src/hash_c++0x.cc
    branches/google/gcc-4_6/libstdc++-v3/src/hash_tr1.cc
    branches/google/gcc-4_6/libstdc++-v3/testsuite/23_containers/unordered_map/erase/51142.cc
    branches/google/gcc-4_6/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/51142.cc
    branches/google/gcc-4_6/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/51142.cc
    branches/google/gcc-4_6/libstdc++-v3/testsuite/23_containers/unordered_set/erase/51142.cc

Changes in other areas also in this revision:
Modified:
    branches/google/gcc-4_6/   (props changed)
    branches/google/gcc-4_6/gcc/config/rs6000/rs6000.c   (props changed)
    branches/google/gcc-4_6/gcc/config/rs6000/rs6000.h   (props changed)
    branches/google/gcc-4_6/gcc/testsuite/gcc.target/powerpc/ppc-round.c   (props changed)
    branches/google/gcc-4_6/libjava/classpath/   (props changed)

Propchange: branches/google/gcc-4_6/
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/gcc/config/rs6000/rs6000.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/gcc/config/rs6000/rs6000.h
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/gcc/testsuite/gcc.target/powerpc/ppc-round.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/libjava/classpath/
            ('svn:mergeinfo' modified)