Return-Path: Delivered-To: apmail-stdcxx-commits-archive@www.apache.org Received: (qmail 59990 invoked from network); 10 Jul 2008 03:43:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jul 2008 03:43:51 -0000 Received: (qmail 97182 invoked by uid 500); 10 Jul 2008 03:43:51 -0000 Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org Received: (qmail 97163 invoked by uid 500); 10 Jul 2008 03:43:51 -0000 Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@stdcxx.apache.org Delivered-To: mailing list commits@stdcxx.apache.org Received: (qmail 97154 invoked by uid 99); 10 Jul 2008 03:43:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jul 2008 20:43:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2008 03:42:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E0A302388A42; Wed, 9 Jul 2008 20:42:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r675429 [2/2] - in /stdcxx/branches/4.3.x: ./ etc/config/src/ examples/include/ include/ include/loc/ include/rw/ src/ tests/containers/ tests/include/ tests/utilities/ Date: Thu, 10 Jul 2008 03:42:44 -0000 To: commits@stdcxx.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080710034249.E0A302388A42@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: stdcxx/branches/4.3.x/include/rw/_tree.cc URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_tree.cc?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/rw/_tree.cc (original) +++ stdcxx/branches/4.3.x/include/rw/_tree.cc Wed Jul 9 20:42:40 2008 @@ -169,7 +169,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: _C_insert (_C_link_t __x, _C_link_t __y, const value_type &__v) { @@ -177,8 +177,8 @@ ++_C_size; // for notational convenience - const _TYPENAME _C_node_t::_C_color_t _Red = _C_node_t::_C_red; - const _TYPENAME _C_node_t::_C_color_t _Black = _C_node_t::_C_black; + const typename _C_node_t::_C_color_t _Red = _C_node_t::_C_red; + const typename _C_node_t::_C_color_t _Black = _C_node_t::_C_black; const _C_link_t _Null = _C_link_t (); if ( __y == _C_end || _Null != __x @@ -328,7 +328,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: insert (iterator __it, const value_type &__v, bool __dup) { @@ -399,7 +399,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::erase (iterator __it) { _RWSTD_ASSERT_RANGE (begin (), __it); @@ -422,8 +422,8 @@ return end (); // for notational convenience - const _TYPENAME _C_node_t::_C_color_t _Red = _C_node_t::_C_red; - const _TYPENAME _C_node_t::_C_color_t _Black = _C_node_t::_C_black; + const typename _C_node_t::_C_color_t _Red = _C_node_t::_C_red; + const typename _C_node_t::_C_color_t _Black = _C_node_t::_C_black; const _C_link_t _Null = _C_link_t (); // returned iterator pointing to the element just past `it' @@ -762,7 +762,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::size_type +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::size_type __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: erase (const key_type &__x) { @@ -777,7 +777,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::_C_link_t +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::_C_link_t __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: _C_copy (_C_link_t __x, _C_link_t __p) { @@ -818,7 +818,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: erase (iterator __first, iterator __last) { @@ -851,7 +851,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: find (const key_type &__k) { @@ -863,7 +863,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: lower_bound (const key_type &__k) { @@ -884,7 +884,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: upper_bound (const key_type &__k) { @@ -904,12 +904,12 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::size_type +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::size_type __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: _C_depth (const_iterator __it, size_type *__rank /* = 0 */) const { // for notational convenience - const _TYPENAME _C_node_t::_C_color_t _Black = _C_node_t::_C_black; + const typename _C_node_t::_C_color_t _Black = _C_node_t::_C_black; const _C_link_t _Null = _C_link_t (); const _C_link_t __node = _ITER_NODE (__it); @@ -919,7 +919,7 @@ #ifdef _RWSTDDEBUG - const _TYPENAME _C_node_t::_C_color_t _Red = _C_node_t::_C_red; + const typename _C_node_t::_C_color_t _Red = _C_node_t::_C_red; if (_Red == __node->_C_color) { @@ -975,7 +975,7 @@ template -_TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::size_type +typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::size_type __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: _C_level (const_iterator __it) const { Modified: stdcxx/branches/4.3.x/include/rw/_tree.h URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_tree.h?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/rw/_tree.h (original) +++ stdcxx/branches/4.3.x/include/rw/_tree.h Wed Jul 9 20:42:40 2008 @@ -87,8 +87,8 @@ typedef _RWSTD_REBIND (allocator_type, __rw_rb_tree_node) _C_node_alloc_t; typedef _RWSTD_REBIND (allocator_type, _Key) _C_key_alloc_t; - typedef _TYPENAME _C_node_alloc_t::pointer _C_link_t; - typedef _TYPENAME _C_key_alloc_t::const_reference _C_const_key_ref; + typedef typename _C_node_alloc_t::pointer _C_link_t; + typedef typename _C_key_alloc_t::const_reference _C_const_key_ref; _C_color_t _C_color; _C_link_t _C_parent; @@ -128,14 +128,14 @@ _TypeT, _DiffT, _Pointer, _Reference> _C_iter_base; public: - typedef _TYPENAME _C_iter_base::value_type value_type; - typedef _TYPENAME _C_iter_base::difference_type difference_type; - typedef _TYPENAME _C_iter_base::pointer pointer; - typedef _TYPENAME _C_iter_base::reference reference; - typedef _TYPENAME _C_iter_base::iterator_category iterator_category; + typedef typename _C_iter_base::value_type value_type; + typedef typename _C_iter_base::difference_type difference_type; + typedef typename _C_iter_base::pointer pointer; + typedef typename _C_iter_base::reference reference; + typedef typename _C_iter_base::iterator_category iterator_category; typedef _Node _C_node_t; - typedef _TYPENAME _C_node_t::allocator_type allocator_type; - typedef _TYPENAME _C_node_t::_C_link_t _C_link_t; + typedef typename _C_node_t::allocator_type allocator_type; + typedef typename _C_node_t::_C_link_t _C_link_t; typedef const value_type* const_pointer; typedef const value_type& const_reference; @@ -263,7 +263,7 @@ typedef _RWSTD_ALLOC_TYPE (_Alloc,_Val) _C_val_alloc_t; typedef _RWSTD_REBIND (_Alloc, _Key) _C_key_alloc_t; typedef _RWSTD_REBIND (_Alloc, _C_node_t) _C_node_alloc_t; - typedef _TYPENAME _C_node_alloc_t::pointer _C_link_t; + typedef typename _C_node_alloc_t::pointer _C_link_t; public: @@ -272,12 +272,12 @@ typedef _Comp key_compare; typedef _Alloc allocator_type; - typedef _TYPENAME _C_val_alloc_t::pointer pointer; - typedef _TYPENAME _C_val_alloc_t::const_pointer const_pointer; - typedef _TYPENAME allocator_type::size_type size_type; - typedef _TYPENAME allocator_type::difference_type difference_type; - typedef _TYPENAME _C_val_alloc_t::reference reference; - typedef _TYPENAME _C_val_alloc_t::const_reference const_reference; + typedef typename _C_val_alloc_t::pointer pointer; + typedef typename _C_val_alloc_t::const_pointer const_pointer; + typedef typename allocator_type::size_type size_type; + typedef typename allocator_type::difference_type difference_type; + typedef typename _C_val_alloc_t::reference reference; + typedef typename _C_val_alloc_t::const_reference const_reference; private: @@ -333,15 +333,15 @@ struct _C_node_buf { typedef _RWSTD_REBIND (allocator_type, _C_node_buf) _C_buf_alloc_t; - typedef _TYPENAME _C_buf_alloc_t::pointer _C_buf_ptr_t; + typedef typename _C_buf_alloc_t::pointer _C_buf_ptr_t; _C_buf_ptr_t _C_next_buffer; size_type size; _C_link_t _C_buffer; }; - typedef _TYPENAME _C_node_buf::_C_buf_alloc_t _C_buf_alloc_t; - typedef _TYPENAME _C_node_buf::_C_buf_ptr_t _C_buf_ptr_t; + typedef typename _C_node_buf::_C_buf_alloc_t _C_buf_alloc_t; + typedef typename _C_node_buf::_C_buf_ptr_t _C_buf_ptr_t; _C_buf_ptr_t _C_buf_list; _C_link_t _C_free_list; @@ -819,7 +819,7 @@ template -inline _TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::size_type +inline typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::size_type __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>:: count (const _Key& __k) const { @@ -830,7 +830,7 @@ #define _RWSTD_RB_TREE_ITER \ - _TYPENAME __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator + typename __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::iterator template inline _STD::pair<_RWSTD_RB_TREE_ITER , _RWSTD_RB_TREE_ITER > Modified: stdcxx/branches/4.3.x/include/rw/_tuple.h URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_tuple.h?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/rw/_tuple.h (original) +++ stdcxx/branches/4.3.x/include/rw/_tuple.h Wed Jul 9 20:42:40 2008 @@ -202,8 +202,8 @@ template struct __rw_make_tuple { - typedef _TYPENAME _RWSTD_DECAY (_TypeT) _C_decay; - typedef _TYPENAME __rw_deduce_ref<_C_decay>::_C_type _C_type; + typedef typename _RWSTD_DECAY (_TypeT) _C_decay; + typedef typename __rw_deduce_ref<_C_decay>::_C_type _C_type; }; Modified: stdcxx/branches/4.3.x/include/rw/_typetraits.h URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_typetraits.h?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/rw/_typetraits.h (original) +++ stdcxx/branches/4.3.x/include/rw/_typetraits.h Wed Jul 9 20:42:40 2008 @@ -236,7 +236,7 @@ #else // prevent references from causing an error - typedef _TYPENAME __rw_is_reference<_TypeT>::_C_type _C_type; + typedef typename __rw_is_reference<_TypeT>::_C_type _C_type; // working around an HP aCC bug (see PR #25347) // NOTE: this fails for classes due to another bug (PR #25384) @@ -267,12 +267,12 @@ template struct __rw_type_traits { - typedef _TYPENAME __rw_is_const<_TypeT>::_C_type _C_non_const_type; - typedef _TYPENAME __rw_is_volatile<_TypeT>::_C_type _C_non_volatile_type; - typedef _TYPENAME __rw_is_pointer<_TypeT>::_C_type _C_non_pointer_type; - typedef _TYPENAME __rw_is_reference<_TypeT>::_C_type _C_non_reference_type; + typedef typename __rw_is_const<_TypeT>::_C_type _C_non_const_type; + typedef typename __rw_is_volatile<_TypeT>::_C_type _C_non_volatile_type; + typedef typename __rw_is_pointer<_TypeT>::_C_type _C_non_pointer_type; + typedef typename __rw_is_reference<_TypeT>::_C_type _C_non_reference_type; - typedef _TYPENAME __rw_is_cv_qualified<_TypeT>::_C_type + typedef typename __rw_is_cv_qualified<_TypeT>::_C_type _C_non_cv_qualified_type; enum { Modified: stdcxx/branches/4.3.x/include/set URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/set?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/set (original) +++ stdcxx/branches/4.3.x/include/set Wed Jul 9 20:42:40 2008 @@ -98,20 +98,20 @@ // const iterators. This is intentional, the purpose is to // prevent the modification of a set element after it has // been inserted. - typedef _TYPENAME __rep_type::reference reference; - typedef _TYPENAME __rep_type::const_reference const_reference; - typedef _TYPENAME __rep_type::const_iterator iterator; - typedef _TYPENAME __rep_type::const_iterator const_iterator; - typedef _TYPENAME __rep_type::size_type size_type; - typedef _TYPENAME __rep_type::difference_type difference_type; - typedef _TYPENAME __rep_type::pointer pointer; - typedef _TYPENAME __rep_type::const_pointer const_pointer; + typedef typename __rep_type::reference reference; + typedef typename __rep_type::const_reference const_reference; + typedef typename __rep_type::const_iterator iterator; + typedef typename __rep_type::const_iterator const_iterator; + typedef typename __rep_type::size_type size_type; + typedef typename __rep_type::difference_type difference_type; + typedef typename __rep_type::pointer pointer; + typedef typename __rep_type::const_pointer const_pointer; #if !defined (_RWSTD_NO_MEMBER_TEMPLATES) - typedef _TYPENAME __rep_type::const_reverse_iterator reverse_iterator; + typedef typename __rep_type::const_reverse_iterator reverse_iterator; #else - typedef _TYPENAME __rep_type::reverse_iterator reverse_iterator; + typedef typename __rep_type::reverse_iterator reverse_iterator; #endif - typedef _TYPENAME __rep_type::const_reverse_iterator + typedef typename __rep_type::const_reverse_iterator const_reverse_iterator; // @@ -161,7 +161,7 @@ // modifiers // pair insert (const value_type& __x) { - const pair<_TYPENAME __rep_type::iterator, bool> __p = + const pair __p = _C_rep.insert (__x, false); return pair(__p.first, __p.second); } @@ -184,18 +184,18 @@ // working around MSVC bugs iterator insert (iterator __it, const value_type& __x) { - typedef _TYPENAME __rep_type::iterator _Iterator; + typedef typename __rep_type::iterator _Iterator; return _RWSTD_REINTERPRET_CAST (iterator&, _C_rep.insert ( _RWSTD_REINTERPRET_CAST (_Iterator&, __it), __x, false)); } void erase (iterator __it) { - typedef _TYPENAME __rep_type::iterator _Iterator; + typedef typename __rep_type::iterator _Iterator; _C_rep.erase (_RWSTD_REINTERPRET_CAST (_Iterator&, __it)); } void erase (iterator __first, iterator __last) { - typedef _TYPENAME __rep_type::iterator _Iterator; + typedef typename __rep_type::iterator _Iterator; _C_rep.erase (_RWSTD_REINTERPRET_CAST (_Iterator&, __first), _RWSTD_REINTERPRET_CAST (_Iterator&, __last)); } @@ -303,16 +303,16 @@ // // types // - typedef _TYPENAME __rep_type::reference reference; - typedef _TYPENAME __rep_type::const_reference const_reference; - typedef _TYPENAME __rep_type::iterator iterator; - typedef _TYPENAME __rep_type::const_iterator const_iterator; - typedef _TYPENAME __rep_type::size_type size_type; - typedef _TYPENAME __rep_type::difference_type difference_type; - typedef _TYPENAME __rep_type::pointer pointer; - typedef _TYPENAME __rep_type::const_pointer const_pointer; - typedef _TYPENAME __rep_type::reverse_iterator reverse_iterator; - typedef _TYPENAME __rep_type::const_reverse_iterator + typedef typename __rep_type::reference reference; + typedef typename __rep_type::const_reference const_reference; + typedef typename __rep_type::iterator iterator; + typedef typename __rep_type::const_iterator const_iterator; + typedef typename __rep_type::size_type size_type; + typedef typename __rep_type::difference_type difference_type; + typedef typename __rep_type::pointer pointer; + typedef typename __rep_type::const_pointer const_pointer; + typedef typename __rep_type::reverse_iterator reverse_iterator; + typedef typename __rep_type::const_reverse_iterator const_reverse_iterator; // Modified: stdcxx/branches/4.3.x/include/sstream URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/sstream?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/sstream (original) +++ stdcxx/branches/4.3.x/include/sstream Wed Jul 9 20:42:40 2008 @@ -103,9 +103,9 @@ typedef _Traits traits_type; typedef _Allocator allocator_type; // lwg issue 251 - typedef _TYPENAME traits_type::int_type int_type; - typedef _TYPENAME traits_type::pos_type pos_type; - typedef _TYPENAME traits_type::off_type off_type; + typedef typename traits_type::int_type int_type; + typedef typename traits_type::pos_type pos_type; + typedef typename traits_type::off_type off_type; _EXPLICIT basic_stringbuf (ios_base::openmode __mode = _RW::__rw_in_out) @@ -259,9 +259,9 @@ typedef _Traits traits_type; typedef _Allocator allocator_type; - typedef _TYPENAME traits_type::int_type int_type; - typedef _TYPENAME traits_type::pos_type pos_type; - typedef _TYPENAME traits_type::off_type off_type; + typedef typename traits_type::int_type int_type; + typedef typename traits_type::pos_type pos_type; + typedef typename traits_type::off_type off_type; _EXPLICIT basic_istringstream (ios_base::openmode __mode = ios_base::in) @@ -327,9 +327,9 @@ typedef _Traits traits_type; typedef _Allocator allocator_type; - typedef _TYPENAME traits_type::int_type int_type; - typedef _TYPENAME traits_type::pos_type pos_type; - typedef _TYPENAME traits_type::off_type off_type; + typedef typename traits_type::int_type int_type; + typedef typename traits_type::pos_type pos_type; + typedef typename traits_type::off_type off_type; // NOTE: the constructors pass the address of a yet uninitialized // data member to the constructor of the base class @@ -397,9 +397,9 @@ typedef _Traits traits_type; typedef _Allocator allocator_type; - typedef _TYPENAME traits_type::int_type int_type; - typedef _TYPENAME traits_type::pos_type pos_type; - typedef _TYPENAME traits_type::int_type off_type; + typedef typename traits_type::int_type int_type; + typedef typename traits_type::pos_type pos_type; + typedef typename traits_type::int_type off_type; _EXPLICIT basic_stringstream (ios_base::openmode __mode = _RW::__rw_in_out) Modified: stdcxx/branches/4.3.x/include/sstream.cc URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/sstream.cc?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/sstream.cc (original) +++ stdcxx/branches/4.3.x/include/sstream.cc Wed Jul 9 20:42:40 2008 @@ -240,7 +240,7 @@ template -/* virtual */ _TYPENAME basic_stringbuf<_CharT, _Traits, _Allocator>::int_type +/* virtual */ typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type basic_stringbuf<_CharT, _Traits, _Allocator>:: underflow () { @@ -266,7 +266,7 @@ template -_TYPENAME basic_stringbuf<_CharT, _Traits, _Allocator>::int_type +typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type basic_stringbuf<_CharT, _Traits, _Allocator>:: overflow (int_type __c) { @@ -304,7 +304,7 @@ template -/* virtual */ _TYPENAME basic_stringbuf<_CharT, _Traits, _Allocator>::int_type +/* virtual */ typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type basic_stringbuf<_CharT, _Traits, _Allocator>:: pbackfail (int_type __c) { @@ -394,7 +394,7 @@ template -/* virtual */ _TYPENAME basic_stringbuf<_CharT, _Traits, _Allocator>::pos_type +/* virtual */ typename basic_stringbuf<_CharT, _Traits, _Allocator>::pos_type basic_stringbuf<_CharT, _Traits, _Allocator>:: seekoff (off_type __off, ios_base::seekdir __way, ios_base::openmode __which) { @@ -473,7 +473,7 @@ template -/* virtual */ _TYPENAME basic_stringbuf<_CharT, _Traits, _Allocator>::pos_type +/* virtual */ typename basic_stringbuf<_CharT, _Traits, _Allocator>::pos_type basic_stringbuf<_CharT, _Traits, _Allocator>:: seekpos (pos_type __pos, ios_base::openmode __which) { Modified: stdcxx/branches/4.3.x/include/stack URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/stack?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/stack (original) +++ stdcxx/branches/4.3.x/include/stack Wed Jul 9 20:42:40 2008 @@ -74,11 +74,11 @@ public: typedef _Container container_type; - typedef _TYPENAME container_type::value_type value_type; - typedef _TYPENAME container_type::size_type size_type; + typedef typename container_type::value_type value_type; + typedef typename container_type::size_type size_type; // lwg issue 307: additional typedefs - typedef _TYPENAME container_type::reference reference; - typedef _TYPENAME container_type::const_reference const_reference; + typedef typename container_type::reference reference; + typedef typename container_type::const_reference const_reference; protected: Modified: stdcxx/branches/4.3.x/include/streambuf URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/streambuf?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/streambuf (original) +++ stdcxx/branches/4.3.x/include/streambuf Wed Jul 9 20:42:40 2008 @@ -66,9 +66,9 @@ public: typedef _CharT char_type; typedef _Traits traits_type; - typedef _TYPENAME traits_type::int_type int_type; - typedef _TYPENAME traits_type::pos_type pos_type; - typedef _TYPENAME traits_type::off_type off_type; + typedef typename traits_type::int_type int_type; + typedef typename traits_type::pos_type pos_type; + typedef typename traits_type::off_type off_type; virtual ~basic_streambuf () { } @@ -427,7 +427,7 @@ template -inline _TYPENAME basic_streambuf<_CharT, _Traits>::int_type +inline typename basic_streambuf<_CharT, _Traits>::int_type basic_streambuf<_CharT, _Traits>:: sbumpc () { @@ -444,7 +444,7 @@ template -inline _TYPENAME basic_streambuf<_CharT, _Traits>::int_type +inline typename basic_streambuf<_CharT, _Traits>::int_type basic_streambuf<_CharT, _Traits>:: sputbackc (char_type __c) { @@ -458,7 +458,7 @@ template -inline _TYPENAME basic_streambuf<_CharT, _Traits>::int_type +inline typename basic_streambuf<_CharT, _Traits>::int_type basic_streambuf<_CharT, _Traits>:: sputc (char_type __ch) { @@ -480,7 +480,7 @@ template -inline _TYPENAME basic_streambuf<_CharT, _Traits>::int_type +inline typename basic_streambuf<_CharT, _Traits>::int_type basic_streambuf<_CharT, _Traits>:: sungetc () { Modified: stdcxx/branches/4.3.x/include/streambuf.cc URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/streambuf.cc?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/streambuf.cc (original) +++ stdcxx/branches/4.3.x/include/streambuf.cc Wed Jul 9 20:42:40 2008 @@ -49,7 +49,7 @@ template -_TYPENAME basic_streambuf<_CharT, _Traits>::int_type +typename basic_streambuf<_CharT, _Traits>::int_type basic_streambuf<_CharT, _Traits>:: uflow () { Modified: stdcxx/branches/4.3.x/include/string URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/string?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/string (original) +++ stdcxx/branches/4.3.x/include/string Wed Jul 9 20:42:40 2008 @@ -81,7 +81,7 @@ public: typedef _Traits traits_type; - typedef _TYPENAME traits_type::char_type value_type; + typedef typename traits_type::char_type value_type; typedef _Allocator allocator_type; typedef _RW::__string_ref @@ -92,12 +92,12 @@ typedef _RWSTD_REBIND(allocator_type, _C_string_ref_type) _C_ref_alloc_type; - typedef _TYPENAME allocator_type::size_type size_type; - typedef _TYPENAME allocator_type::difference_type difference_type; - typedef _TYPENAME allocator_type::reference reference; - typedef _TYPENAME allocator_type::const_reference const_reference; - typedef _TYPENAME allocator_type::pointer pointer; - typedef _TYPENAME allocator_type::const_pointer const_pointer; + typedef typename allocator_type::size_type size_type; + typedef typename allocator_type::difference_type difference_type; + typedef typename allocator_type::reference reference; + typedef typename allocator_type::const_reference const_reference; + typedef typename allocator_type::pointer pointer; + typedef typename allocator_type::const_pointer const_pointer; #ifndef _RWSTD_NO_DEBUG_ITER @@ -928,7 +928,7 @@ template -inline _TYPENAME basic_string<_CharT, _Traits, _Alloc>::size_type +inline typename basic_string<_CharT, _Traits, _Alloc>::size_type basic_string<_CharT, _Traits, _Alloc>:: _C_grow (size_type __from, size_type __to) const { @@ -958,7 +958,7 @@ template -inline _TYPENAME basic_string<_CharT, _Traits, _Allocator>::iterator +inline typename basic_string<_CharT, _Traits, _Allocator>::iterator basic_string<_CharT, _Traits, _Allocator>:: begin () { @@ -976,7 +976,7 @@ template -inline _TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +inline typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: max_size () const { @@ -1005,7 +1005,7 @@ template -inline _TYPENAME basic_string<_CharT, _Traits, _Allocator>::const_reference +inline typename basic_string<_CharT, _Traits, _Allocator>::const_reference basic_string<_CharT, _Traits, _Allocator>:: operator[] (size_type __pos) const { @@ -1024,7 +1024,7 @@ template -inline _TYPENAME basic_string<_CharT, _Traits, _Allocator>::reference +inline typename basic_string<_CharT, _Traits, _Allocator>::reference basic_string<_CharT, _Traits, _Allocator>:: operator[] (size_type __pos) { @@ -1044,7 +1044,7 @@ template -inline _TYPENAME basic_string<_CharT, _Traits, _Allocator>::const_reference +inline typename basic_string<_CharT, _Traits, _Allocator>::const_reference basic_string<_CharT, _Traits, _Allocator>:: at (size_type __pos) const { @@ -1059,7 +1059,7 @@ template -inline _TYPENAME basic_string<_CharT, _Traits, _Allocator>::reference +inline typename basic_string<_CharT, _Traits, _Allocator>::reference basic_string<_CharT, _Traits, _Allocator>:: at (size_type __pos) { @@ -1153,7 +1153,7 @@ template -inline _TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +inline typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: find (value_type __c, size_type __pos) const { @@ -1333,7 +1333,7 @@ operator== (const _CharT* __lhs, const basic_string<_CharT, _Traits, _Allocator>& __rhs) { - const _TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type + const typename basic_string<_CharT, _Traits, _Allocator>::size_type __n = _Traits::length (__lhs); // avoid using basic_string<>::compare() for efficiency @@ -1528,7 +1528,7 @@ # ifndef _RWSTD_NO_NONDEDUCED_CONTEXT # define _RWSTD_STRING_SIZE_TYPE \ - _TYPENAME _STD::basic_string<_CharT, _Traits, _Allocator>::size_type + typename _STD::basic_string<_CharT, _Traits, _Allocator>::size_type # else # define _RWSTD_STRING_SIZE_TYPE _RWSTD_SIZE_T # endif // _RWSTD_NO_NONDEDUCED_CONTEXT Modified: stdcxx/branches/4.3.x/include/string.cc URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/string.cc?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/string.cc (original) +++ stdcxx/branches/4.3.x/include/string.cc Wed Jul 9 20:42:40 2008 @@ -47,7 +47,7 @@ # ifndef _RWSTD_NO_STRING_NPOS_TYPE template -const _TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +const typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: npos /* = SIZE_MAX */; @@ -74,7 +74,7 @@ template -_TYPENAME basic_string<_CharT, _Traits, _Allocator>::_C_string_ref_type* +typename basic_string<_CharT, _Traits, _Allocator>::_C_string_ref_type* basic_string<_CharT, _Traits, _Allocator>:: _C_get_rep (size_type __cap, size_type __len) { @@ -474,9 +474,9 @@ _InputIter __first2, _InputIter __last2) { typedef _Traits traits_type; - typedef _TYPENAME traits_type::char_type value_type; + typedef typename traits_type::char_type value_type; typedef _Alloc allocator_type; - typedef _TYPENAME allocator_type::size_type size_type; + typedef typename allocator_type::size_type size_type; typedef _STD::basic_string<_CharT, _Traits, _Alloc> _C_string_type; @@ -519,7 +519,7 @@ return __s.__replace_aux (__first1, __last1, __first2, __last2); _C_string_type __s3; - _TYPENAME _C_string_type::iterator __first3 = __s3.begin (); + typename _C_string_type::iterator __first3 = __s3.begin (); for ( ; !(__first2 == __last2); ++__first2, ++__first3) { @@ -572,13 +572,13 @@ _InputIter __first2, _InputIter __last2) { typedef _Traits traits_type; - typedef _TYPENAME traits_type::char_type value_type; + typedef typename traits_type::char_type value_type; typedef _Alloc allocator_type; - typedef _TYPENAME allocator_type::size_type size_type; - typedef _TYPENAME allocator_type::difference_type difference_type; - typedef _TYPENAME allocator_type::pointer pointer; - typedef _TYPENAME allocator_type::const_pointer const_pointer; - typedef _TYPENAME allocator_type::const_reference const_reference; + typedef typename allocator_type::size_type size_type; + typedef typename allocator_type::difference_type difference_type; + typedef typename allocator_type::pointer pointer; + typedef typename allocator_type::const_pointer const_pointer; + typedef typename allocator_type::const_reference const_reference; typedef _RW::__string_ref _C_string_ref_type; @@ -671,7 +671,7 @@ template -_TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: copy (pointer __s, size_type __n, size_type __pos) const { @@ -690,7 +690,7 @@ template -_TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: find (const_pointer __seq, size_type __off, size_type __len) const { @@ -749,7 +749,7 @@ template -_TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: rfind (const_pointer __s, size_type __pos, size_type __n) const { @@ -771,7 +771,7 @@ template -_TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: find_first_of (const_pointer __s, size_type __pos, size_type __n) const { @@ -788,7 +788,7 @@ template -_TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: find_last_of (const_pointer __s, size_type __pos, size_type __n) const { @@ -809,7 +809,7 @@ template -_TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: find_first_not_of (const_pointer __s, size_type __pos, size_type __n) const { @@ -832,7 +832,7 @@ template -_TYPENAME basic_string<_CharT, _Traits, _Allocator>::size_type +typename basic_string<_CharT, _Traits, _Allocator>::size_type basic_string<_CharT, _Traits, _Allocator>:: find_last_not_of (const_pointer __s, size_type __pos, size_type __n) const { Modified: stdcxx/branches/4.3.x/include/tuple URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/tuple?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/tuple (original) +++ stdcxx/branches/4.3.x/include/tuple Wed Jul 9 20:42:40 2008 @@ -294,10 +294,10 @@ # if !defined _RWSTD_NO_RVALUE_REFERENCES template -inline tuple<_TYPENAME _RW::__rw_make_tuple<_TypesT>::_C_type...> +inline tuple::_C_type...> make_tuple (_TypesT&&... __values) { - typedef tuple<_TYPENAME _RW::__rw_make_tuple<_TypesT>::_C_type...> _Tuple; + typedef tuple::_C_type...> _Tuple; return _Tuple (_RWSTD_FORWARD (_TypesT, __values)...); } @@ -359,9 +359,9 @@ typedef _RW::__rw_tuple<_Head, _Tail...> _Tuple; - typedef _TYPENAME _RWSTD_ADD_LVALUE_REFERENCE (_Head) _Ref; - typedef _TYPENAME _RWSTD_ADD_CONST (_Head) _ConstHead; - typedef _TYPENAME _RWSTD_ADD_LVALUE_REFERENCE (_ConstHead) _ConstRef; + typedef typename _RWSTD_ADD_LVALUE_REFERENCE (_Head) _Ref; + typedef typename _RWSTD_ADD_CONST (_Head) _ConstHead; + typedef typename _RWSTD_ADD_LVALUE_REFERENCE (_ConstHead) _ConstRef; static _Ref _C_get (_Tuple& __tuple) { return __tuple._C_head (); } @@ -381,7 +381,7 @@ // 20.3.1.5, element access: template <_RWSTD_SIZE_T _Index, class _Head, class... _Tail> -inline _TYPENAME tuple_element<_Index, tuple<_Head, _Tail...> >::_Ref +inline typename tuple_element<_Index, tuple<_Head, _Tail...> >::_Ref get (tuple<_Head, _Tail...>& __tuple) { typedef tuple_element<_Index, tuple<_Head, _Tail...> > _Tuple; @@ -389,7 +389,7 @@ } template <_RWSTD_SIZE_T _Index, class _Head, class... _Tail> -inline _TYPENAME tuple_element<_Index, tuple<_Head, _Tail...> >::_ConstRef +inline typename tuple_element<_Index, tuple<_Head, _Tail...> >::_ConstRef get (const tuple<_Head, _Tail...>& __tuple) { typedef tuple_element<_Index, tuple<_Head, _Tail...> > _Tuple; Modified: stdcxx/branches/4.3.x/include/type_traits URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/type_traits?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/type_traits (original) +++ stdcxx/branches/4.3.x/include/type_traits Wed Jul 9 20:42:40 2008 @@ -335,98 +335,98 @@ template struct remove_const { - typedef _TYPENAME _RW::__rw_remove_const<_TypeT>::type type; + typedef typename _RW::__rw_remove_const<_TypeT>::type type; }; template struct remove_volatile { - typedef _TYPENAME _RW::__rw_remove_volatile<_TypeT>::type type; + typedef typename _RW::__rw_remove_volatile<_TypeT>::type type; }; template struct remove_cv { - typedef _TYPENAME _RW::__rw_remove_cv<_TypeT>::type type; + typedef typename _RW::__rw_remove_cv<_TypeT>::type type; }; template struct add_const { - typedef _TYPENAME _RW::__rw_add_const<_TypeT>::type type; + typedef typename _RW::__rw_add_const<_TypeT>::type type; }; template struct add_volatile { - typedef _TYPENAME _RW::__rw_add_volatile<_TypeT>::type type; + typedef typename _RW::__rw_add_volatile<_TypeT>::type type; }; template struct add_cv { - typedef _TYPENAME _RW::__rw_add_cv<_TypeT>::type type; + typedef typename _RW::__rw_add_cv<_TypeT>::type type; }; template struct remove_reference { - typedef _TYPENAME _RW::__rw_remove_reference<_TypeT>::type type; + typedef typename _RW::__rw_remove_reference<_TypeT>::type type; }; template struct add_lvalue_reference { - typedef _TYPENAME _RW::__rw_add_lvalue_reference<_TypeT>::type type; + typedef typename _RW::__rw_add_lvalue_reference<_TypeT>::type type; }; template struct add_rvalue_reference { - typedef _TYPENAME _RW::__rw_add_rvalue_reference<_TypeT>::type type; + typedef typename _RW::__rw_add_rvalue_reference<_TypeT>::type type; }; template struct make_signed { - typedef _TYPENAME _RW::__rw_make_signed<_TypeT>::type type; + typedef typename _RW::__rw_make_signed<_TypeT>::type type; }; template struct make_unsigned { - typedef _TYPENAME _RW::__rw_make_unsigned<_TypeT>::type type; + typedef typename _RW::__rw_make_unsigned<_TypeT>::type type; }; template struct remove_extent { - typedef _TYPENAME _RW::__rw_remove_extent<_TypeT>::type type; + typedef typename _RW::__rw_remove_extent<_TypeT>::type type; }; template struct remove_all_extents { - typedef _TYPENAME _RW::__rw_remove_all_extents<_TypeT>::type type; + typedef typename _RW::__rw_remove_all_extents<_TypeT>::type type; }; template struct remove_pointer { - typedef _TYPENAME _RW::__rw_remove_pointer<_TypeT>::type type; + typedef typename _RW::__rw_remove_pointer<_TypeT>::type type; }; template struct add_pointer { - typedef _TYPENAME _RW::__rw_add_pointer<_TypeT>::type type; + typedef typename _RW::__rw_add_pointer<_TypeT>::type type; }; template <_RWSTD_SIZE_T _Len, _RWSTD_SIZE_T _Align = _RW::__rw_default_alignment<_Len>::value> struct aligned_storage { - typedef _TYPENAME _RW::__rw_aligned_storage<_Len, _Align>::type type; + typedef typename _RW::__rw_aligned_storage<_Len, _Align>::type type; }; #ifndef _RWSTD_NO_VARIADIC_TEMPLATES @@ -456,7 +456,7 @@ template struct decay { - typedef _TYPENAME _RW::__rw_decay<_TypeT>::type type; + typedef typename _RW::__rw_decay<_TypeT>::type type; }; template @@ -473,7 +473,7 @@ template struct conditional { - typedef _TYPENAME + typedef typename _RW::__rw_conditional<_Select, _TypeT, _TypeU>::type type; }; Modified: stdcxx/branches/4.3.x/include/valarray URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/valarray?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/valarray (original) +++ stdcxx/branches/4.3.x/include/valarray Wed Jul 9 20:42:40 2008 @@ -238,12 +238,12 @@ // implements symmetric non-member valarray binary operators template -inline _STD::valarray<_TYPENAME _BinaryFunction::result_type> +inline _STD::valarray __rw_binary_function (const _STD::valarray<_TypeT> &__lhs, const _STD::valarray<_TypeT> &__rhs, _BinaryFunction __fun) { - typedef _TYPENAME _BinaryFunction::result_type result_type; + typedef typename _BinaryFunction::result_type result_type; typedef _STD::raw_storage_iterator _Iter; // allocate but do not initialize @@ -261,11 +261,11 @@ // implements asymmetric non-member valarray binary operators template -inline _STD::valarray<_TYPENAME _BinaryFunction::result_type> +inline _STD::valarray __rw_binary_function (const _STD::valarray<_TypeT> &__val, _BinaryFunction __fun) { - typedef _TYPENAME _BinaryFunction::result_type result_type; + typedef typename _BinaryFunction::result_type result_type; typedef _STD::raw_storage_iterator _Iter; // allocate but do not initialize Modified: stdcxx/branches/4.3.x/include/vector URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/vector?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/vector (original) +++ stdcxx/branches/4.3.x/include/vector Wed Jul 9 20:42:40 2008 @@ -94,12 +94,12 @@ typedef _TypeT value_type; typedef _Allocator allocator_type; - typedef _TYPENAME allocator_type::size_type size_type; - typedef _TYPENAME allocator_type::difference_type difference_type; - typedef _TYPENAME allocator_type::reference reference; - typedef _TYPENAME allocator_type::const_reference const_reference; - typedef _TYPENAME allocator_type::pointer pointer; - typedef _TYPENAME allocator_type::const_pointer const_pointer; + typedef typename allocator_type::size_type size_type; + typedef typename allocator_type::difference_type difference_type; + typedef typename allocator_type::reference reference; + typedef typename allocator_type::const_reference const_reference; + typedef typename allocator_type::pointer pointer; + typedef typename allocator_type::const_pointer const_pointer; typedef _RWSTD_ALLOC_TYPE (allocator_type, value_type) _C_value_alloc_type; public: @@ -414,7 +414,7 @@ template -inline _TYPENAME vector<_TypeT, _Allocator>::reference +inline typename vector<_TypeT, _Allocator>::reference vector<_TypeT, _Allocator>:: operator[] (size_type __n) { @@ -432,7 +432,7 @@ template -inline _TYPENAME vector<_TypeT, _Allocator>::const_reference +inline typename vector<_TypeT, _Allocator>::const_reference vector<_TypeT, _Allocator>:: operator[] (size_type __n) const { @@ -450,7 +450,7 @@ template -inline _TYPENAME vector<_TypeT, _Allocator>::reference +inline typename vector<_TypeT, _Allocator>::reference vector<_TypeT, _Allocator>:: at (size_type __n) { @@ -463,7 +463,7 @@ template -inline _TYPENAME vector<_TypeT, _Allocator>::const_reference +inline typename vector<_TypeT, _Allocator>::const_reference vector<_TypeT, _Allocator>:: at (size_type __n) const { @@ -517,7 +517,7 @@ template -inline _TYPENAME vector<_TypeT, _Allocator>::iterator +inline typename vector<_TypeT, _Allocator>::iterator vector<_TypeT, _Allocator>:: insert (iterator __it, const_reference __x) { @@ -535,7 +535,7 @@ template -inline _TYPENAME vector<_TypeT, _Allocator>::iterator +inline typename vector<_TypeT, _Allocator>::iterator vector<_TypeT, _Allocator>:: erase (iterator __it) { @@ -555,7 +555,7 @@ template -inline _TYPENAME vector<_TypeT, _Allocator>::iterator +inline typename vector<_TypeT, _Allocator>::iterator vector<_TypeT, _Allocator>:: erase (iterator __first, iterator __last) { @@ -690,11 +690,11 @@ vector: private _Allocator { -#if defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) && !defined (_RWSTD_NO_TYPENAME) - // clear _TYPENAME -# undef _TYPENAME -# define _TYPENAME -#endif // _RWSTD_NO_CLASS_PARTIAL_SPEC && !_RWSTD_NO_TYPENAME +#if defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) + // clear typename +# undef typename +# define typename +#endif // _RWSTD_NO_CLASS_PARTIAL_SPEC typedef _RWSTD_REBIND(_Allocator, unsigned int) _C_value_alloc_type; typedef vector _C_self; @@ -703,16 +703,16 @@ typedef _Allocator allocator_type; typedef bool value_type; - typedef _TYPENAME allocator_type::size_type size_type; - typedef _TYPENAME allocator_type::difference_type difference_type; - typedef _TYPENAME _C_value_alloc_type::pointer pointer; - typedef _TYPENAME _C_value_alloc_type::const_pointer const_pointer; - -#if defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) && !defined (_RWSTD_NO_TYPENAME) - // restore _TYPENAME -# undef _TYPENAME -# define _TYPENAME typename -#endif // _RWSTD_NO_CLASS_PARTIAL_SPEC && !_RWSTD_NO_TYPENAME + typedef typename allocator_type::size_type size_type; + typedef typename allocator_type::difference_type difference_type; + typedef typename _C_value_alloc_type::pointer pointer; + typedef typename _C_value_alloc_type::const_pointer const_pointer; + +#if defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) + // restore typename +# undef typename +# define typename typename +#endif // _RWSTD_NO_CLASS_PARTIAL_SPEC class iterator; class const_iterator; Modified: stdcxx/branches/4.3.x/include/vector.cc URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/vector.cc?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/include/vector.cc (original) +++ stdcxx/branches/4.3.x/include/vector.cc Wed Jul 9 20:42:40 2008 @@ -334,7 +334,7 @@ __rw_assign_range (vector<_TypeT, _Allocator> *__self, _InputIter __first, _InputIter __last, input_iterator_tag) { - typedef _TYPENAME vector<_TypeT, _Allocator>::iterator iterator; + typedef typename vector<_TypeT, _Allocator>::iterator iterator; #endif // _RWSTD_NO_MEMBER_TEMPLATES @@ -400,13 +400,13 @@ __rw_assign_range (vector<_TypeT, _Allocator> *__self, _FwdIter __first, _FwdIter __last, forward_iterator_tag) { - typedef _TYPENAME vector<_TypeT, _Allocator>::value_type value_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::allocator_type + typedef typename vector<_TypeT, _Allocator>::value_type value_type; + typedef typename vector<_TypeT, _Allocator>::allocator_type allocator_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::_C_value_alloc_type + typedef typename vector<_TypeT, _Allocator>::_C_value_alloc_type _C_value_alloc_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::size_type size_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::iterator iterator; + typedef typename vector<_TypeT, _Allocator>::size_type size_type; + typedef typename vector<_TypeT, _Allocator>::iterator iterator; #endif // _RWSTD_NO_MEMBER_TEMPLATES @@ -494,11 +494,11 @@ __rw_insert_range (vector<_TypeT, _Allocator> *__self, _VectorIter __it, _InputIter __first, _InputIter __last, input_iterator_tag) { - typedef _TYPENAME vector<_TypeT, _Allocator>::value_type value_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::allocator_type + typedef typename vector<_TypeT, _Allocator>::value_type value_type; + typedef typename vector<_TypeT, _Allocator>::allocator_type allocator_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::size_type size_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::pointer pointer; + typedef typename vector<_TypeT, _Allocator>::size_type size_type; + typedef typename vector<_TypeT, _Allocator>::pointer pointer; #endif // _RWSTD_NO_MEMBER_TEMPLATES @@ -596,14 +596,14 @@ _FwdIter __first, _FwdIter __last, forward_iterator_tag) { - typedef _TYPENAME vector<_TypeT, _Allocator>::value_type value_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::allocator_type + typedef typename vector<_TypeT, _Allocator>::value_type value_type; + typedef typename vector<_TypeT, _Allocator>::allocator_type allocator_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::_C_value_alloc_type + typedef typename vector<_TypeT, _Allocator>::_C_value_alloc_type _C_value_alloc_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::size_type size_type; - typedef _TYPENAME vector<_TypeT, _Allocator>::pointer pointer; - typedef _TYPENAME vector<_TypeT, _Allocator>::iterator iterator; + typedef typename vector<_TypeT, _Allocator>::size_type size_type; + typedef typename vector<_TypeT, _Allocator>::pointer pointer; + typedef typename vector<_TypeT, _Allocator>::iterator iterator; #endif // _RWSTD_NO_MEMBER_TEMPLATES Modified: stdcxx/branches/4.3.x/src/collate.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/src/collate.cpp?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/src/collate.cpp (original) +++ stdcxx/branches/4.3.x/src/collate.cpp Wed Jul 9 20:42:40 2008 @@ -254,7 +254,7 @@ // non-ignore value will collate first if (*weightp == 0) { - typedef _TYPENAME _STR_T::value_type CharT; + typedef typename _STR_T::value_type CharT; const CharT ign = _STD::numeric_limits::max (); @@ -276,7 +276,7 @@ weightp = weightp + 1 + pass * impl->longest_weight; // non-ignore value will collate first if (*weightp == 0) { - typedef _TYPENAME _STR_T::value_type CharT; + typedef typename _STR_T::value_type CharT; const CharT ign = _STD::numeric_limits::max (); @@ -292,7 +292,7 @@ } // append a 1 to designate the end of the pass - typedef _TYPENAME _STR_T::value_type CharT; + typedef typename _STR_T::value_type CharT; out += CharT (1); cur_start = cur_end; Modified: stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp (original) +++ stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp Wed Jul 9 20:42:40 2008 @@ -724,7 +724,7 @@ N, _j, test_set(b).bits ()); // exercise std::bitset::reference - _TYPENAME std::bitset::reference r = b [_j]; + typename std::bitset::reference r = b [_j]; // std::bitset::reference::flip() r.flip (); Modified: stdcxx/branches/4.3.x/tests/include/rw_testdefs.h URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/include/rw_testdefs.h?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/tests/include/rw_testdefs.h (original) +++ stdcxx/branches/4.3.x/tests/include/rw_testdefs.h Wed Jul 9 20:42:40 2008 @@ -61,11 +61,6 @@ #endif // _RWSTD_NO_NAMESPACE && !std -#if defined (_RWSTD_NO_TYPENAME) && !defined (typename) -# define typename /* ignore */ -#endif // _RWSTD_NO_TYPENAME && !typename - - #if defined (_RWSTD_NO_EXCEPTIONS) # ifndef try # define try if (0); else Modified: stdcxx/branches/4.3.x/tests/utilities/20.auto.ptr.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/utilities/20.auto.ptr.cpp?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/tests/utilities/20.auto.ptr.cpp (original) +++ stdcxx/branches/4.3.x/tests/utilities/20.auto.ptr.cpp Wed Jul 9 20:42:40 2008 @@ -157,7 +157,7 @@ // exercise 20.4.5, p2 - auto_ptr<> interface - typedef _TYPENAME std::auto_ptr::element_type element_type; + typedef typename std::auto_ptr::element_type element_type; // verify that element_type is the same as T element_type *elem = (T*)0; Modified: stdcxx/branches/4.3.x/tests/utilities/20.meta.help.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/utilities/20.meta.help.cpp?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/tests/utilities/20.meta.help.cpp (original) +++ stdcxx/branches/4.3.x/tests/utilities/20.meta.help.cpp Wed Jul 9 20:42:40 2008 @@ -108,7 +108,7 @@ // verify that the type typedef is correct const bool e = - test_is_same<_TYPENAME integral_constant_type::type, + test_is_same::value; rw_assert (e, 0, __LINE__, "integral_constant<%s, %s>::type is%{?}n't%{;} " @@ -126,7 +126,7 @@ // verify the type of the type typedef const bool a = - test_is_same<_TYPENAME integral_constant_type::value_type, bool>::value; + test_is_same::value; rw_assert (a, 0, __LINE__, "%s::value_type is%{?}n't%{;} same as bool", name, !a); @@ -145,7 +145,7 @@ "%s is%{?}n't%{;} of type integral_constant", name, !c, value); - test_integral_constant<_TYPENAME integral_constant_type::value_type, + test_integral_constant("bool", value); } Modified: stdcxx/branches/4.3.x/tests/utilities/20.meta.trans.other.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/utilities/20.meta.trans.other.cpp?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/tests/utilities/20.meta.trans.other.cpp (original) +++ stdcxx/branches/4.3.x/tests/utilities/20.meta.trans.other.cpp Wed Jul 9 20:42:40 2008 @@ -57,7 +57,7 @@ // this function should available _only_ if T is char template int -enabled_if_char (_TYPENAME std::enable_if::val>::type* = 0) +enabled_if_char (typename std::enable_if::val>::type* = 0) { return 1; } @@ -65,7 +65,7 @@ // this function should be available if T is _not_ char template int -enabled_if_char (_TYPENAME std::enable_if::val>::type* = 0) +enabled_if_char (typename std::enable_if::val>::type* = 0) { return 0; } Modified: stdcxx/branches/4.3.x/tests/utilities/20.operators.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/utilities/20.operators.cpp?rev=675429&r1=675428&r2=675429&view=diff ============================================================================== --- stdcxx/branches/4.3.x/tests/utilities/20.operators.cpp (original) +++ stdcxx/branches/4.3.x/tests/utilities/20.operators.cpp Wed Jul 9 20:42:40 2008 @@ -397,7 +397,9 @@ typedef RandomAccessIterator I; - RandomNumberGenerator rndgen; + typedef typename std::iterator_traits::difference_type DiffT; + + RandomNumberGenerator rndgen; std::random_shuffle (I (), I ()); std::random_shuffle (I (), I (), rndgen);