summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/tr1
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2010-02-22 18:07:07 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2010-02-22 18:07:07 +0000
commit2c63b18ae04dda5ac8d3eae675ff577fb5eed404 (patch)
tree693f10a9d6779d0b412ce48ee525da435130140f /libstdc++-v3/include/tr1
parentc21cf15cd9421a802ab70cd461d4e135e20db943 (diff)
downloadppe42-gcc-2c63b18ae04dda5ac8d3eae675ff577fb5eed404.tar.gz
ppe42-gcc-2c63b18ae04dda5ac8d3eae675ff577fb5eed404.zip
2010-02-22 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/functional_hash.h (hash<string>, hash<wstring>, hash<u16string>, hash<u32string>, hash<error_code>): Move, per DR 1182 to... * include/bits/basic_string.h: ... here. * include/std/system_error: ... and here, respectively. * src/hash-aux.cc (hash<long double>::operator()(long double)): Move definition... * src/hash_c++0x.cc: ... here, new file. * src/hash_tr1.cc: ... and here, tweak includes. * src/compatibility-c++0x.cc (hash, _Fnv_hash): Remove. * src/Makefile.am: Adjust. * src/Makefile.in: Regenerate. * include/std/functional: Include <bits/functexcept.h>. * include/std/unordered_set: Remove redundant include. * include/std/unordered_map: Likewise. * include/tr1/functional_hash.h: Remove spurious trailing semicolon. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Remove dg-excess. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156971 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/tr1')
-rw-r--r--libstdc++-v3/include/tr1/functional_hash.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/tr1/functional_hash.h b/libstdc++-v3/include/tr1/functional_hash.h
index d6849300f4c..d944fa9ff0f 100644
--- a/libstdc++-v3/include/tr1/functional_hash.h
+++ b/libstdc++-v3/include/tr1/functional_hash.h
@@ -140,7 +140,7 @@ namespace tr1
__result = _Fnv_hash<>::hash(reinterpret_cast<const char*>(&__val),
sizeof(__val));
return __result;
- };
+ }
/// Explicit specializations for double.
template<>
@@ -154,7 +154,7 @@ namespace tr1
__result = _Fnv_hash<>::hash(reinterpret_cast<const char*>(&__val),
sizeof(__val));
return __result;
- };
+ }
/// Explicit specializations for long double.
template<>
OpenPOWER on IntegriCloud