diff options
author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-07-31 14:36:13 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-07-31 14:36:13 +0000 |
commit | 4333e4dcf71fae98cdbe872ce95aa3b11a128549 (patch) | |
tree | 3db6819c9ea61b7bf1a42000cb5e4ac465572c8d /libstdc++-v3 | |
parent | c3f35647ff0ca30479971bb449058b733384d728 (diff) | |
download | gcc-4333e4dcf71fae98cdbe872ce95aa3b11a128549.zip gcc-4333e4dcf71fae98cdbe872ce95aa3b11a128549.tar.gz gcc-4333e4dcf71fae98cdbe872ce95aa3b11a128549.tar.bz2 |
re PR libstdc++/56627 (class hash instead of struct hash)
2013-07-31 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/56627
* include/bits/stl_bvector.h: Use friend struct hash intead of
friend class hash to work around useless warnings produced by
some compilers.
* include/std/bitset: Likewise.
From-SVN: r201377
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_bvector.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/std/bitset | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 10daa9f..9b9efa7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2013-07-31 Paolo Carlini <paolo.carlini@oracle.com> + PR libstdc++/56627 + * include/bits/stl_bvector.h: Use friend struct hash intead of + friend class hash to work around useless warnings produced by + some compilers. + * include/std/bitset: Likewise. + +2013-07-31 Paolo Carlini <paolo.carlini@oracle.com> + * src/c++11/functexcept.cc: Do not include the whole <regex>. * src/c++11/regex.cc: Likewise. diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 887ea16..468fad0 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -528,7 +528,7 @@ template<typename _Alloc> typedef _Bvector_base<_Alloc> _Base; #if __cplusplus >= 201103L - template<typename> friend class hash; + template<typename> friend struct hash; #endif public: diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index 08ba2cd..1da6baf 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -760,7 +760,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER } #if __cplusplus >= 201103L - template<typename> friend class hash; + template<typename> friend struct hash; #endif public: |