From: Benjamin Kosnik Date: Wed, 10 Oct 2007 15:23:59 +0000 (+0000) Subject: re PR libstdc++/33633 (-D_GLIBCXX_DEBUG vs ext/hash_*) X-Git-Tag: releases/gcc-4.3.0~2117 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c456e6f17ced807b3c80a5f4578fb8711e604056;p=thirdparty%2Fgcc.git re PR libstdc++/33633 (-D_GLIBCXX_DEBUG vs ext/hash_*) 2007-10-10 Benjamin Kosnik PR libstdc++/33633 * include/debug/hash_multimap.h: Change _GLIBCXX_EXT to _GLIBCXX_EXT_D. * include/debug/hash_set.h: Same. * include/debug/hash_multiset.h: Same. * include/debug/hash_map.h: Same. 2007-10-10 Benjamin Kosnik * include/parallel/losertree.h (loser_tree_traits_unguarded): To loser_tree_unguarded_traits. * include/parallel/multiway_merge.h (__gnu_parallel): Same. From-SVN: r129210 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 44afe2e44878..145a75cd38c9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2007-10-10 Benjamin Kosnik + + PR libstdc++/33633 + * include/debug/hash_multimap.h: Change _GLIBCXX_EXT to _GLIBCXX_EXT_D. + * include/debug/hash_set.h: Same. + * include/debug/hash_multiset.h: Same. + * include/debug/hash_map.h: Same. + +2007-10-10 Benjamin Kosnik + + * include/parallel/losertree.h (loser_tree_traits_unguarded): To + loser_tree_unguarded_traits. + * include/parallel/multiway_merge.h (__gnu_parallel): Same. + 2007-10-10 Paolo Carlini Chris Fairles @@ -20,7 +34,7 @@ * libsupc++/guard.cc: Make single conditional variable implementation dependent to __GTHREAD_HAS_COND. -2007-10-09 Benjamin Kosnik +2007-10-09 Benjamin Kosnik PR libstdc++/33489 continued. * include/parallel/features.h (_GLIBCXX_LOSER_TREE): Set to zero. diff --git a/libstdc++-v3/include/debug/hash_map.h b/libstdc++-v3/include/debug/hash_map.h index 1eb6acb869c3..aeac90b8a136 100644 --- a/libstdc++-v3/include/debug/hash_map.h +++ b/libstdc++-v3/include/debug/hash_map.h @@ -1,6 +1,6 @@ // Debugging hash_map implementation -*- C++ -*- -// Copyright (C) 2003, 2005, 2006 +// Copyright (C) 2003, 2005, 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -47,11 +47,11 @@ namespace __debug typename _EqualKey = std::equal_to<_Value>, typename _Alloc = std::allocator<_Value> > class hash_map - : public _GLIBCXX_EXT::hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>, + : public _GLIBCXX_EXT_D::hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>, public __gnu_debug::_Safe_sequence > { - typedef _GLIBCXX_EXT::hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc> + typedef _GLIBCXX_EXT_D::hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc> _Base; typedef __gnu_debug::_Safe_sequence _Safe_base; diff --git a/libstdc++-v3/include/debug/hash_multimap.h b/libstdc++-v3/include/debug/hash_multimap.h index e3c689ac7cd2..985fbc83030f 100644 --- a/libstdc++-v3/include/debug/hash_multimap.h +++ b/libstdc++-v3/include/debug/hash_multimap.h @@ -47,11 +47,11 @@ namespace __debug typename _EqualKey = std::equal_to<_Value>, typename _Alloc = std::allocator<_Value> > class hash_multimap - : public _GLIBCXX_EXT::hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>, + : public _GLIBCXX_EXT_D::hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>, public __gnu_debug::_Safe_sequence > { - typedef _GLIBCXX_EXT::hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc> + typedef _GLIBCXX_EXT_D::hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc> _Base; typedef __gnu_debug::_Safe_sequence _Safe_base; diff --git a/libstdc++-v3/include/debug/hash_multiset.h b/libstdc++-v3/include/debug/hash_multiset.h index 934649694871..11efb5b68464 100644 --- a/libstdc++-v3/include/debug/hash_multiset.h +++ b/libstdc++-v3/include/debug/hash_multiset.h @@ -47,11 +47,11 @@ namespace __debug typename _EqualKey = std::equal_to<_Value>, typename _Alloc = std::allocator<_Value> > class hash_multiset - : public _GLIBCXX_EXT::hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>, + : public _GLIBCXX_EXT_D::hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>, public __gnu_debug::_Safe_sequence > { - typedef _GLIBCXX_EXT:: hash_multiset<_Value,_HashFcn, _EqualKey,_Alloc> + typedef _GLIBCXX_EXT_D:: hash_multiset<_Value,_HashFcn, _EqualKey,_Alloc> _Base; typedef __gnu_debug::_Safe_sequence _Safe_base; diff --git a/libstdc++-v3/include/debug/hash_set.h b/libstdc++-v3/include/debug/hash_set.h index 2d3e0b303fb6..9178063289b0 100644 --- a/libstdc++-v3/include/debug/hash_set.h +++ b/libstdc++-v3/include/debug/hash_set.h @@ -1,6 +1,6 @@ // Debugging hash_set implementation -*- C++ -*- -// Copyright (C) 2003, 2005, 2006 +// Copyright (C) 2003, 2005, 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -47,11 +47,11 @@ namespace __debug typename _EqualKey = std::equal_to<_Value>, typename _Alloc = std::allocator<_Value> > class hash_set - : public _GLIBCXX_EXT::hash_set<_Value, _HashFcn, _EqualKey,_Alloc>, + : public _GLIBCXX_EXT_D::hash_set<_Value, _HashFcn, _EqualKey,_Alloc>, public __gnu_debug::_Safe_sequence > { - typedef _GLIBCXX_EXT::hash_set<_Value, _HashFcn, _EqualKey,_Alloc> _Base; + typedef _GLIBCXX_EXT_D::hash_set<_Value, _HashFcn, _EqualKey,_Alloc> _Base; typedef __gnu_debug::_Safe_sequence _Safe_base; public: diff --git a/libstdc++-v3/include/parallel/losertree.h b/libstdc++-v3/include/parallel/losertree.h index 8117995e34ae..5c7a8085e209 100644 --- a/libstdc++-v3/include/parallel/losertree.h +++ b/libstdc++-v3/include/parallel/losertree.h @@ -1094,7 +1094,7 @@ namespace __gnu_parallel }; template - struct loser_tree_traits_unguarded + struct loser_tree_unguarded_traits { #if _GLIBCXX_LOSER_TREE_UNGUARDED typedef LoserTreeUnguarded<_ValueTp, Comparator> LT; @@ -1102,7 +1102,7 @@ namespace __gnu_parallel # if _GLIBCXX_LOSER_TREE_POINTER_UNGUARDED typedef LoserTreePointerUnguarded<_ValueTp, Comparator> LT; # else -# error Must define some type in losertree.h. +# error Must define some unguarded type in losertree.h. # endif #endif }; diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h index b72321547955..c727e44f0fca 100644 --- a/libstdc++-v3/include/parallel/multiway_merge.h +++ b/libstdc++-v3/include/parallel/multiway_merge.h @@ -1109,7 +1109,7 @@ namespace __gnu_parallel { difference_type unguarded_length = std::min(length, total_length - overhang); target_end = multiway_merge_loser_tree_unguarded - ::LT> + ::LT> (seqs_begin, seqs_end, target, comp, unguarded_length, stable); overhang = length - unguarded_length; } @@ -1166,7 +1166,7 @@ namespace __gnu_parallel difference_type unguarded_length = std::min(length, total_length - overhang); target_end = multiway_merge_loser_tree_unguarded - ::LT> + ::LT> (seqs_begin, seqs_end, target, comp, unguarded_length, stable); overhang = length - unguarded_length;