stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r675429 [1/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 GMT
Author: sebor
Date: Wed Jul  9 20:42:40 2008
New Revision: 675429

URL: http://svn.apache.org/viewvc?rev=675429&view=rev
Log:
2008-07-09  Martin Sebor  <sebor@roguewave.com>

	* include/queue (typename): Replaced uses of the _TYPENAME macro
	with the now universally supported C++ keyword.
	* include/fstream: Same.
	* include/set: Same.
	* include/list: Same.
	* include/bitset.cc: Same.
	* include/string: Same.
	* include/streambuf.cc: Same.
	* include/ostream.cc: Same.
	* include/map: Same.
	* include/valarray: Same.
	* include/streambuf: Same.
	* include/loc/_money_put.cc: Same.
	* include/loc/_messages.cc: Same.
	* include/loc/_num_put.cc: Same.
	* include/loc/_ctype.cc: Same.
	* include/loc/_numpunct.h: Same.
	* include/loc/_time_get.cc: Same.
	* include/loc/_money_get.cc: Same.
	* include/loc/_num_get.cc: Same.
	* include/loc/_time_put.cc: Same.
	* include/algorithm.cc: Same.
	* include/ostream: Same.
	* include/functional: Same.
	* include/vector.cc: Same.
	* include/type_traits: Same.
	* include/fstream.cc: Same.
	* include/istream.cc: Same.
	* include/deque.cc: Same.
	* include/stack: Same.
	* include/string.cc: Same.
	* include/list.cc: Same.
	* include/istream: Same.
	* include/vector: Same.
	* include/deque: Same.
	* include/bitset: Same.
	* include/algorithm: Same.
	* include/sstream: Same.
	* include/array: Same.
	* include/rw/_defs.h: Same.
	* include/rw/_tree.cc: Same.
	* include/rw/_iterbase.h: Same.
	* include/rw/_select.h: Same.
	* include/rw/_tuple.h: Same.
	* include/rw/_iterator.h: Same.
	* include/rw/_basic_ios.h: Same.
	* include/rw/_specialized.h: Same.
	* include/rw/_ioinsert.cc: Same.
	* include/rw/_tree.h: Same.
	* include/rw/_stringio.cc: Same.
	* include/rw/_strref.h: Same.
	* include/rw/_streamiter.h: Same.
	* include/rw/_forward.h: Same.
	* include/rw/_autoptr.h: Same.
	* include/rw/_smartptr.h: Same.
	* include/rw/_funcbase.h: Same.
	* include/rw/_typetraits.h: Same.
	* include/rw/_allocator.h: Same.
	* include/rw/_ioiter.h: Same.
	* include/rw/_algobase.h: Same.
	* include/sstream.cc: Same.
	* include/tuple: Same.
	* src/collate.cpp: Same.
	* examples/include/examples.h: Same.
	* tests/containers/23.bitset.cpp: Same.
	* tests/utilities/20.meta.help.cpp: Same.
	* tests/utilities/20.auto.ptr.cpp: Same.
	* tests/utilities/20.meta.trans.other.cpp: Same.
	* tests/include/rw_testdefs.h: Same.

	* include/rw/_defs.h (_TYPENAME): Removed macro #definition.
	* include/vector [!_RWSTD_NO_TYPENAME] (typename): Removed macro
	#definition.
	* examples/include/examples.h: Same.
	* tests/include/rw_testdefs.h: Same.
	* etc/config/src/DEPENDENT_TEMPLATE.cpp: Same.
	* etc/config/src/NONDEDUCED_CONTEXT.cpp: Same.
	* etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp: Same.
	* etc/config/src/TYPENAME.cpp: Deleted.
	* README (_TYPENAME): Same.

Removed:
    stdcxx/branches/4.3.x/etc/config/src/TYPENAME.cpp
Modified:
    stdcxx/branches/4.3.x/README
    stdcxx/branches/4.3.x/etc/config/src/DEPENDENT_TEMPLATE.cpp
    stdcxx/branches/4.3.x/etc/config/src/NONDEDUCED_CONTEXT.cpp
    stdcxx/branches/4.3.x/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp
    stdcxx/branches/4.3.x/examples/include/examples.h
    stdcxx/branches/4.3.x/include/algorithm
    stdcxx/branches/4.3.x/include/algorithm.cc
    stdcxx/branches/4.3.x/include/array
    stdcxx/branches/4.3.x/include/bitset
    stdcxx/branches/4.3.x/include/bitset.cc
    stdcxx/branches/4.3.x/include/deque
    stdcxx/branches/4.3.x/include/deque.cc
    stdcxx/branches/4.3.x/include/fstream
    stdcxx/branches/4.3.x/include/fstream.cc
    stdcxx/branches/4.3.x/include/functional
    stdcxx/branches/4.3.x/include/istream
    stdcxx/branches/4.3.x/include/istream.cc
    stdcxx/branches/4.3.x/include/list
    stdcxx/branches/4.3.x/include/list.cc
    stdcxx/branches/4.3.x/include/loc/_ctype.cc
    stdcxx/branches/4.3.x/include/loc/_messages.cc
    stdcxx/branches/4.3.x/include/loc/_money_get.cc
    stdcxx/branches/4.3.x/include/loc/_money_put.cc
    stdcxx/branches/4.3.x/include/loc/_num_get.cc
    stdcxx/branches/4.3.x/include/loc/_num_put.cc
    stdcxx/branches/4.3.x/include/loc/_numpunct.h
    stdcxx/branches/4.3.x/include/loc/_time_get.cc
    stdcxx/branches/4.3.x/include/loc/_time_put.cc
    stdcxx/branches/4.3.x/include/map
    stdcxx/branches/4.3.x/include/ostream
    stdcxx/branches/4.3.x/include/ostream.cc
    stdcxx/branches/4.3.x/include/queue
    stdcxx/branches/4.3.x/include/rw/_algobase.h
    stdcxx/branches/4.3.x/include/rw/_allocator.h
    stdcxx/branches/4.3.x/include/rw/_autoptr.h
    stdcxx/branches/4.3.x/include/rw/_basic_ios.h
    stdcxx/branches/4.3.x/include/rw/_defs.h
    stdcxx/branches/4.3.x/include/rw/_forward.h
    stdcxx/branches/4.3.x/include/rw/_funcbase.h
    stdcxx/branches/4.3.x/include/rw/_ioinsert.cc
    stdcxx/branches/4.3.x/include/rw/_ioiter.h
    stdcxx/branches/4.3.x/include/rw/_iterator.h
    stdcxx/branches/4.3.x/include/rw/_iterbase.h
    stdcxx/branches/4.3.x/include/rw/_select.h
    stdcxx/branches/4.3.x/include/rw/_smartptr.h
    stdcxx/branches/4.3.x/include/rw/_specialized.h
    stdcxx/branches/4.3.x/include/rw/_streamiter.h
    stdcxx/branches/4.3.x/include/rw/_stringio.cc
    stdcxx/branches/4.3.x/include/rw/_strref.h
    stdcxx/branches/4.3.x/include/rw/_tree.cc
    stdcxx/branches/4.3.x/include/rw/_tree.h
    stdcxx/branches/4.3.x/include/rw/_tuple.h
    stdcxx/branches/4.3.x/include/rw/_typetraits.h
    stdcxx/branches/4.3.x/include/set
    stdcxx/branches/4.3.x/include/sstream
    stdcxx/branches/4.3.x/include/sstream.cc
    stdcxx/branches/4.3.x/include/stack
    stdcxx/branches/4.3.x/include/streambuf
    stdcxx/branches/4.3.x/include/streambuf.cc
    stdcxx/branches/4.3.x/include/string
    stdcxx/branches/4.3.x/include/string.cc
    stdcxx/branches/4.3.x/include/tuple
    stdcxx/branches/4.3.x/include/type_traits
    stdcxx/branches/4.3.x/include/valarray
    stdcxx/branches/4.3.x/include/vector
    stdcxx/branches/4.3.x/include/vector.cc
    stdcxx/branches/4.3.x/src/collate.cpp
    stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp
    stdcxx/branches/4.3.x/tests/include/rw_testdefs.h
    stdcxx/branches/4.3.x/tests/utilities/20.auto.ptr.cpp
    stdcxx/branches/4.3.x/tests/utilities/20.meta.help.cpp
    stdcxx/branches/4.3.x/tests/utilities/20.meta.trans.other.cpp
    stdcxx/branches/4.3.x/tests/utilities/20.operators.cpp

Modified: stdcxx/branches/4.3.x/README
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/README?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/README (original)
+++ stdcxx/branches/4.3.x/README Wed Jul  9 20:42:40 2008
@@ -1188,10 +1188,6 @@
      the  public library  header  <new> do  not  include the  required
      exception specifications.
 
-  o  _RWSTD_NO_TYPENAME [auto]
-
-     #defined when they keyword typename isn't fully supported.
-
   o  _RWSTD_NO_COLLAPSE_STATIC_LOCALS [auto]
 
      #defined when  the compiler/linker fail to  collapse static local

Modified: stdcxx/branches/4.3.x/etc/config/src/DEPENDENT_TEMPLATE.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/etc/config/src/DEPENDENT_TEMPLATE.cpp?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/etc/config/src/DEPENDENT_TEMPLATE.cpp (original)
+++ stdcxx/branches/4.3.x/etc/config/src/DEPENDENT_TEMPLATE.cpp Wed Jul  9 20:42:40 2008
@@ -24,11 +24,6 @@
 
 #include "config.h"
 
-#ifdef _RWSTD_NO_TYPENAME
-
-#  define typename
-
-#endif
 
 template <class T>
 struct A

Modified: stdcxx/branches/4.3.x/etc/config/src/NONDEDUCED_CONTEXT.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/etc/config/src/NONDEDUCED_CONTEXT.cpp?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/etc/config/src/NONDEDUCED_CONTEXT.cpp (original)
+++ stdcxx/branches/4.3.x/etc/config/src/NONDEDUCED_CONTEXT.cpp Wed Jul  9 20:42:40 2008
@@ -24,10 +24,6 @@
 
 #include "config.h"
 
-#ifdef _RWSTD_NO_TYPENAME
-#  define typename
-#endif
-
 
 // T::I is not deducible directly, but can be
 // deduced if the T in const T* can (14.8.2.4, p3)

Modified: stdcxx/branches/4.3.x/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp (original)
+++ stdcxx/branches/4.3.x/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp Wed Jul  9 20:42:40 2008
@@ -24,10 +24,6 @@
 
 #include "config.h"
 
-#ifdef _RWSTD_NO_TYPENAME
-#  define typename /* empty */
-#endif   // _RWSTD_NO_TYPENAME
-
 struct A { typedef int I; };
 
 template <class T>

Modified: stdcxx/branches/4.3.x/examples/include/examples.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/examples/include/examples.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/examples/include/examples.h (original)
+++ stdcxx/branches/4.3.x/examples/include/examples.h Wed Jul  9 20:42:40 2008
@@ -39,11 +39,6 @@
 #endif   // _RWSTD_NO_NAMESPACE
 
 
-#ifdef _RWSTD_NO_TYPENAME
-# define typename
-#endif   // _RWSTD_NO_TYPENAME
-
-
 #ifdef _RWSTD_NO_FOR_LOCAL_SCOPE
 #  define for if (0) ; else for
 #endif   // _RWSTD_NO_FOR_LOCAL_SCOPE

Modified: stdcxx/branches/4.3.x/include/algorithm
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/algorithm?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/algorithm (original)
+++ stdcxx/branches/4.3.x/include/algorithm Wed Jul  9 20:42:40 2008
@@ -177,12 +177,12 @@
 // 25.1.6 - Count [lib.alg.count]
 
 template <class _InputIter, class _TypeT>
-inline _TYPENAME iterator_traits<_InputIter>::difference_type
+inline typename iterator_traits<_InputIter>::difference_type
 count (_InputIter __first, _InputIter __last, const _TypeT &__val)
 {
     _RWSTD_ASSERT_RANGE (__first, __last);
 
-    _TYPENAME iterator_traits<_InputIter>::difference_type __n = 0;
+    typename iterator_traits<_InputIter>::difference_type __n = 0;
     for ( ; !(__first == __last); ++__first)
         if (*__first == __val)
             ++__n;
@@ -191,12 +191,12 @@
 
 
 template <class _InputIter, class _Predicate>
-inline _TYPENAME iterator_traits<_InputIter>::difference_type
+inline typename iterator_traits<_InputIter>::difference_type
 count_if (_InputIter __first, _InputIter __last, _Predicate __pred)
 {
     _RWSTD_ASSERT_RANGE (__first, __last);
 
-    _TYPENAME iterator_traits<_InputIter>::difference_type __n = 0;
+    typename iterator_traits<_InputIter>::difference_type __n = 0;
     for ( ; !(__first == __last); ++__first)
         if (!(__pred (*__first) == false))
             ++__n;

Modified: stdcxx/branches/4.3.x/include/algorithm.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/algorithm.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/algorithm.cc (original)
+++ stdcxx/branches/4.3.x/include/algorithm.cc Wed Jul  9 20:42:40 2008
@@ -596,7 +596,7 @@
     if (!(__first == __last)) {
 
 #ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
-        typedef _TYPENAME
+        typedef typename
             iterator_traits<_RandomAccessIter>::difference_type _DiffT;
 #else   // if defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
         typedef _RWSTD_PTRDIFF_T _DiffT;

Modified: stdcxx/branches/4.3.x/include/array
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/array?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/array (original)
+++ stdcxx/branches/4.3.x/include/array Wed Jul  9 20:42:40 2008
@@ -213,7 +213,7 @@
 
 
 template <class _TypeT, _RWSTD_SIZE_T _Size>
-inline _TYPENAME array<_TypeT, _Size>::reference
+inline typename array<_TypeT, _Size>::reference
 array<_TypeT, _Size>::
 operator[] (size_type __inx)
 {
@@ -231,7 +231,7 @@
   
 
 template <class _TypeT, _RWSTD_SIZE_T _Size>
-inline _TYPENAME array<_TypeT, _Size>::const_reference
+inline typename array<_TypeT, _Size>::const_reference
 array<_TypeT, _Size>::
 operator[] (size_type __inx) const
 {
@@ -249,7 +249,7 @@
   
 
 template <class _TypeT, _RWSTD_SIZE_T _Size>
-inline _TYPENAME array<_TypeT, _Size>::reference
+inline typename array<_TypeT, _Size>::reference
 array<_TypeT, _Size>::
 at (size_type __inx)
 {
@@ -263,7 +263,7 @@
     
 
 template <class _TypeT, _RWSTD_SIZE_T _Size>
-inline _TYPENAME array<_TypeT, _Size>::const_reference
+inline typename array<_TypeT, _Size>::const_reference
 array<_TypeT, _Size>::
 at (size_type __inx)  const
 {

Modified: stdcxx/branches/4.3.x/include/bitset
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/bitset?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/bitset (original)
+++ stdcxx/branches/4.3.x/include/bitset Wed Jul  9 20:42:40 2008
@@ -169,9 +169,9 @@
     template <class _CharT, class _Traits, class _Allocator>
     _EXPLICIT
     bitset (const basic_string<_CharT, _Traits, _Allocator> &__str,
-            _TYPENAME basic_string<_CharT, _Traits,
+            typename basic_string<_CharT, _Traits,
                                    _Allocator>::size_type __pos = 0,
-            _TYPENAME basic_string<_CharT, _Traits,
+            typename basic_string<_CharT, _Traits,
                                    _Allocator>::size_type __n =
                                        _RWSTD_SIZE_MAX,
             _CharT __b0 = '0', _CharT __b1 = '1') {

Modified: stdcxx/branches/4.3.x/include/bitset.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/bitset.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/bitset.cc (original)
+++ stdcxx/branches/4.3.x/include/bitset.cc Wed Jul  9 20:42:40 2008
@@ -127,7 +127,7 @@
 {
     typedef _STD::basic_istream<_CharT, _Traits> _Istream;
 
-    _TYPENAME _Istream::iostate __err (__strm.goodbit);
+    typename _Istream::iostate __err (__strm.goodbit);
 
 
     _STD::bitset<_Size> __tmp;
@@ -137,14 +137,14 @@
     _TRY {
 
         // sentry may throw an exception
-        const _TYPENAME _Istream::sentry __ipfx (__strm);
+        const typename _Istream::sentry __ipfx (__strm);
 
         if (__ipfx) {
 
             // 23.3.5.3, p5 - extract at most _Size chars
 
             // get next char without extracting
-            _TYPENAME _Traits::int_type __c = __strm.rdbuf ()->sgetc ();
+            typename _Traits::int_type __c = __strm.rdbuf ()->sgetc ();
 
             for ( ; __bit; --__bit) {
 

Modified: stdcxx/branches/4.3.x/include/deque
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/deque?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/deque (original)
+++ stdcxx/branches/4.3.x/include/deque Wed Jul  9 20:42:40 2008
@@ -97,11 +97,11 @@
 public:
 
     typedef _Allocator                               allocator_type;
-    typedef _TYPENAME allocator_type::size_type      size_type;
-    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 allocator_type::size_type      size_type;
+    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 random_access_iterator_tag               iterator_category;
     
@@ -110,7 +110,7 @@
     _C_mutable_iter;
 
     typedef _RWSTD_REBIND (allocator_type, value_type*) _C_node_alloc_type;
-    typedef _TYPENAME _C_node_alloc_type::pointer       _C_node_pointer;
+    typedef typename _C_node_alloc_type::pointer       _C_node_pointer;
 
     
     static size_type _C_bufsize () {
@@ -277,8 +277,8 @@
 operator- (const _RWSTD_DEQUE_ITER(1) &__x, const _RWSTD_DEQUE_ITER(2) &__y)
 {
     // _RWSTD_ASSERT_RANGE (__x, __y);
-    typedef _TYPENAME _RWSTD_DEQUE_ITER(1)::pointer _Pointer1;
-    typedef _TYPENAME _RWSTD_DEQUE_ITER(2)::pointer _Pointer2;
+    typedef typename _RWSTD_DEQUE_ITER(1)::pointer _Pointer1;
+    typedef typename _RWSTD_DEQUE_ITER(2)::pointer _Pointer2;
 
     if (_Pointer1 () == __x._C_cur && _Pointer2 () == __y._C_cur) {
         // __x and __y are end-iterator's of the empty deque's
@@ -356,12 +356,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::pointer         pointer;
-    typedef _TYPENAME allocator_type::const_pointer   const_pointer;
-    typedef _TYPENAME allocator_type::reference       reference;
-    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::reference       reference;
+    typedef typename allocator_type::const_reference const_reference;
 
     typedef _RWSTD_ALLOC_TYPE (allocator_type, value_type) _C_value_alloc_type;
 
@@ -374,7 +374,7 @@
 
     typedef _RWSTD_REBIND (allocator_type, value_type*) _C_node_alloc_type;
 
-    typedef _TYPENAME _C_node_alloc_type::pointer       _C_node_pointer;
+    typedef typename _C_node_alloc_type::pointer       _C_node_pointer;
 
 #ifndef _RWSTD_NO_DEBUG_ITER
 

Modified: stdcxx/branches/4.3.x/include/deque.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/deque.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/deque.cc (original)
+++ stdcxx/branches/4.3.x/include/deque.cc Wed Jul  9 20:42:40 2008
@@ -67,7 +67,7 @@
 
 
 template <class _TypeT, class _Allocator>
-_TYPENAME deque<_TypeT, _Allocator>::iterator 
+typename deque<_TypeT, _Allocator>::iterator 
 deque<_TypeT, _Allocator>::
 insert (iterator __it, const_reference __x)
 {
@@ -108,7 +108,7 @@
 
 
 template <class _TypeT, class _Allocator>
-_TYPENAME deque<_TypeT, _Allocator>::iterator 
+typename deque<_TypeT, _Allocator>::iterator 
 deque<_TypeT, _Allocator>::
 erase (iterator __it)
 {
@@ -138,7 +138,7 @@
     
 
 template <class _TypeT, class _Allocator>
-_TYPENAME deque<_TypeT, _Allocator>::iterator 
+typename deque<_TypeT, _Allocator>::iterator 
 deque<_TypeT, _Allocator>::
 erase (iterator __first, iterator __last)
 {
@@ -537,7 +537,7 @@
                    _InputIter __first, _InputIter __last, input_iterator_tag)
 {
     typedef deque<_TypeT, _Allocator> _Deque;
-    typedef _TYPENAME _Deque::iterator iterator;
+    typedef typename _Deque::iterator iterator;
     
 #endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
@@ -692,9 +692,9 @@
 
 {
     typedef deque<_TypeT, _Allocator>         _Deque;
-    typedef _TYPENAME _Deque::difference_type difference_type;
-    typedef _TYPENAME _Deque::size_type       size_type;
-    typedef _TYPENAME _Deque::iterator        iterator;
+    typedef typename _Deque::difference_type difference_type;
+    typedef typename _Deque::size_type       size_type;
+    typedef typename _Deque::iterator        iterator;
 
 #endif   // _RWSTD_NO_MEMBER_TEMPLATES
 

Modified: stdcxx/branches/4.3.x/include/fstream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/fstream?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/fstream (original)
+++ stdcxx/branches/4.3.x/include/fstream Wed Jul  9 20:42:40 2008
@@ -99,9 +99,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;
 
     // 27.8.1.2, p1
     basic_filebuf ()
@@ -292,7 +292,7 @@
 
 
 template<class _CharT, class _Traits>
-inline _TYPENAME basic_filebuf<_CharT, _Traits>::off_type
+inline typename basic_filebuf<_CharT, _Traits>::off_type
 basic_filebuf<_CharT, _Traits>::
 _C_crlf_extern_count (const char* __start, const char* __finish) const
 {
@@ -324,7 +324,7 @@
 
 
 template<class _CharT, class _Traits>
-inline _TYPENAME basic_filebuf<_CharT, _Traits>::off_type
+inline typename basic_filebuf<_CharT, _Traits>::off_type
 basic_filebuf<_CharT, _Traits>::
 _C_crlf_intern_count (const char_type* __start,
                       const char_type* __finish) const
@@ -364,9 +364,9 @@
 
     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;
 
     // NOTE: the ctors below pass the address of an unitialized
     //       member variable, _C_filebuf, to a base class ctor
@@ -465,9 +465,9 @@
 
     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;
 
     // NOTE: the ctors below pass the address of an unitialized
     //       member variable, _C_filebuf, to a base class ctor
@@ -565,9 +565,9 @@
 
     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;
 
     // NOTE: the ctors below pass the address of an unitialized
     //       member variable, _C_filebuf, to a base class ctor

Modified: stdcxx/branches/4.3.x/include/fstream.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/fstream.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/fstream.cc (original)
+++ stdcxx/branches/4.3.x/include/fstream.cc Wed Jul  9 20:42:40 2008
@@ -157,7 +157,7 @@
         // restore position within file only if seek succeeded
         _RW::__rw_fseek (_C_file, this->_C_state, _C_cur_pos, ios_base::beg);
 
-        typedef _TYPENAME traits_type::state_type _StateT;
+        typedef typename traits_type::state_type _StateT;
         typedef codecvt<char_type, char, _StateT> _Codecvt;
 
         const _Codecvt &__cvt = _USE_FACET (_Codecvt, this->getloc ());
@@ -174,7 +174,7 @@
 
 
 template<class _CharT, class _Traits>
-_TYPENAME basic_filebuf<_CharT, _Traits>::int_type
+typename basic_filebuf<_CharT, _Traits>::int_type
 basic_filebuf<_CharT, _Traits>::
 underflow ()
 {
@@ -189,7 +189,7 @@
 
     char_type* const __to_end = this->_C_buffer + this->_C_bufsize;
 
-    typedef _TYPENAME traits_type::int_type _IntType;
+    typedef typename traits_type::int_type _IntType;
 
     _IntType __ret = _IntType ();
 
@@ -220,7 +220,7 @@
 
         _C_beg_pos = _C_cur_pos;
 
-        typedef _TYPENAME traits_type::state_type _StateT;
+        typedef typename traits_type::state_type _StateT;
         typedef codecvt<char_type, char, _StateT> _Codecvt;
 
         const _Codecvt &__cvt = _USE_FACET (_Codecvt, this->getloc ());
@@ -359,7 +359,7 @@
 
 
 template<class _CharT, class _Traits>
-_TYPENAME basic_filebuf<_CharT, _Traits>::int_type
+typename basic_filebuf<_CharT, _Traits>::int_type
 basic_filebuf<_CharT, _Traits>::
 overflow (int_type __c /* = eof () */)
 {
@@ -477,7 +477,7 @@
 
     const char_type* const __end = __buf + __nchars;
 
-    typedef _TYPENAME traits_type::state_type _StateT;
+    typedef typename traits_type::state_type _StateT;
 
     _RWSTD_STREAMSIZE __nwrote = 0;          // num chars to write
     _StateT __state = _C_cur_pos.state ();   // state of stream
@@ -581,7 +581,7 @@
 
 
 template<class _CharT, class _Traits>
-_TYPENAME basic_filebuf<_CharT, _Traits>::int_type
+typename basic_filebuf<_CharT, _Traits>::int_type
 basic_filebuf<_CharT, _Traits>::
 pbackfail (int_type __c)
 {
@@ -707,7 +707,7 @@
 
 // 27.8.1.4, p 11
 template<class _CharT, class _Traits>
-_TYPENAME basic_filebuf<_CharT, _Traits>::pos_type
+typename basic_filebuf<_CharT, _Traits>::pos_type
 basic_filebuf<_CharT, _Traits>::
 seekoff (off_type __off, ios_base::seekdir __way, ios_base::openmode)
 {
@@ -716,7 +716,7 @@
     if (!is_open ())
         return pos_type (off_type (-1));
 
-    typedef _TYPENAME traits_type::state_type _StateT;
+    typedef typename traits_type::state_type _StateT;
     typedef codecvt<char_type, char, _StateT> _Codecvt;
 
     const int __width = _USE_FACET (_Codecvt, this->getloc ()).encoding ();
@@ -757,7 +757,7 @@
 
 
 template<class _CharT, class _Traits>
-_TYPENAME basic_filebuf<_CharT, _Traits>::pos_type
+typename basic_filebuf<_CharT, _Traits>::pos_type
 basic_filebuf<_CharT, _Traits>::
 seekpos (pos_type __pos, ios_base::openmode)
 {
@@ -819,7 +819,7 @@
         if (_C_pbacksize == this->_C_bufsize)
             _C_pbacksize = this->_C_bufsize - 1;
 
-        typedef _TYPENAME traits_type::state_type _StateT;
+        typedef typename traits_type::state_type _StateT;
         typedef codecvt<char_type, char, _StateT> _Codecvt;
 
         const _Codecvt &__cvt = _USE_FACET (_Codecvt, this->getloc ());
@@ -956,7 +956,7 @@
 basic_filebuf<_CharT, _Traits>::
 _C_unshift ()
 {
-    typedef _TYPENAME traits_type::state_type _StateT;
+    typedef typename traits_type::state_type _StateT;
     typedef codecvt<char_type, char, _StateT> _Codecvt;
 
     const _Codecvt &__cvt = _USE_FACET (_Codecvt, this->getloc ());

Modified: stdcxx/branches/4.3.x/include/functional
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/functional?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/functional (original)
+++ stdcxx/branches/4.3.x/include/functional Wed Jul  9 20:42:40 2008
@@ -253,11 +253,11 @@
 // 20.3.5, p2
 template <class _Predicate>
 class unary_negate
-    : public unary_function<_TYPENAME _Predicate::argument_type, bool>
+    : public unary_function<typename _Predicate::argument_type, bool>
 {
     _Predicate _C_pred;
 public:
-    _RWSTD_UNARY_FUNCTION_TYPES (_TYPENAME _Predicate::argument_type, bool);
+    _RWSTD_UNARY_FUNCTION_TYPES (typename _Predicate::argument_type, bool);
 
     _EXPLICIT unary_negate (const _Predicate &__pred) : _C_pred (__pred) { }
 
@@ -278,14 +278,14 @@
 // 20.3.5, p4
 template <class _Predicate>
 class binary_negate
-    : public binary_function<_TYPENAME _Predicate::first_argument_type,
-                             _TYPENAME _Predicate::second_argument_type, bool>
+    : public binary_function<typename _Predicate::first_argument_type,
+                             typename _Predicate::second_argument_type, bool>
 {
     _Predicate _C_pred;
 public:
 
-    _RWSTD_BINARY_FUNCTION_TYPES (_TYPENAME _Predicate::first_argument_type,
-                                  _TYPENAME _Predicate::second_argument_type,
+    _RWSTD_BINARY_FUNCTION_TYPES (typename _Predicate::first_argument_type,
+                                  typename _Predicate::second_argument_type,
                                   bool);
 
     _EXPLICIT binary_negate (const _Predicate &__pred) : _C_pred (__pred) { }
@@ -310,19 +310,19 @@
 // 20.3.6.1
 template <class _Operation>
 class binder1st
-    : public unary_function<_TYPENAME _Operation::second_argument_type,
-                            _TYPENAME _Operation::result_type>
+    : public unary_function<typename _Operation::second_argument_type,
+                            typename _Operation::result_type>
 {
 protected:
     _Operation                                op;
-    _TYPENAME _Operation::first_argument_type value;
+    typename _Operation::first_argument_type value;
 public:
 
-    _RWSTD_UNARY_FUNCTION_TYPES (_TYPENAME _Operation::second_argument_type,
-                                 _TYPENAME _Operation::result_type);
+    _RWSTD_UNARY_FUNCTION_TYPES (typename _Operation::second_argument_type,
+                                 typename _Operation::result_type);
 
     binder1st (const _Operation                                &__oper,
-               const _TYPENAME _Operation::first_argument_type &__x)
+               const typename _Operation::first_argument_type &__x)
         : op (__oper), value (__x) { }
 
     result_type
@@ -337,7 +337,7 @@
 inline binder1st<_Operation>
 bind1st (const _Operation &__oper, const _TypeT &__x)
 {
-    typedef _TYPENAME _Operation::first_argument_type first_argument_type;
+    typedef typename _Operation::first_argument_type first_argument_type;
 
     return binder1st<_Operation>(__oper, first_argument_type (__x));
 }
@@ -346,19 +346,19 @@
 // 20.3.6.3
 template <class _Operation>
 class binder2nd
-    : public unary_function<_TYPENAME _Operation::first_argument_type,
-                            _TYPENAME _Operation::result_type>
+    : public unary_function<typename _Operation::first_argument_type,
+                            typename _Operation::result_type>
 {
 protected:
     _Operation                                 op;
-    _TYPENAME _Operation::second_argument_type value;
+    typename _Operation::second_argument_type value;
 public:
 
-    _RWSTD_UNARY_FUNCTION_TYPES (_TYPENAME _Operation::first_argument_type,
-                                 _TYPENAME _Operation::result_type);
+    _RWSTD_UNARY_FUNCTION_TYPES (typename _Operation::first_argument_type,
+                                 typename _Operation::result_type);
 
     binder2nd (const _Operation                                 &__oper,
-               const _TYPENAME _Operation::second_argument_type &__y)
+               const typename _Operation::second_argument_type &__y)
         : op (__oper), value (__y) { }
 
     result_type
@@ -373,7 +373,7 @@
 inline binder2nd<_Operation>
 bind2nd (const _Operation &__oper, const _TypeT &__x)
 {
-    typedef _TYPENAME _Operation::second_argument_type second_argument_type;
+    typedef typename _Operation::second_argument_type second_argument_type;
     return binder2nd<_Operation>(__oper, second_argument_type (__x));
 }
 

Modified: stdcxx/branches/4.3.x/include/istream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/istream?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/istream (original)
+++ stdcxx/branches/4.3.x/include/istream Wed Jul  9 20:42:40 2008
@@ -129,9 +129,9 @@
 
     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;
       
     // 27.6.1.1.1, p1
     _EXPLICIT basic_istream (basic_streambuf<char_type, traits_type> *__sb)
@@ -362,7 +362,7 @@
 
 
 template<class _CharT, class _Traits>
-inline _TYPENAME basic_istream<_CharT, _Traits>::int_type
+inline typename basic_istream<_CharT, _Traits>::int_type
 basic_istream<_CharT, _Traits>::
 get ()
 {
@@ -445,7 +445,7 @@
 
 
 template<class _CharT, class _Traits>
-inline _TYPENAME basic_istream<_CharT, _Traits>::int_type
+inline typename basic_istream<_CharT, _Traits>::int_type
 basic_istream<_CharT, _Traits>::peek ()
 {
     _RWSTD_ASSERT (0 != this->rdbuf ());
@@ -543,7 +543,7 @@
 ws (basic_istream<_CharT, _Traits> &__strm)
 {
     // construct a sentry to flush tied stream (if any) and lock
-    const _TYPENAME basic_istream<_CharT, _Traits>::sentry
+    const typename basic_istream<_CharT, _Traits>::sentry
         __ipfx (__strm, true /* noskipws */);
 
     // if sentry is okay, skip whitespace and set eofbit
@@ -572,9 +572,9 @@
     // prevent ambiguity between types defined in the bases
     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;
 
     _EXPLICIT basic_iostream (basic_streambuf<_CharT, _Traits> *__sb)
         : basic_istream<_CharT, _Traits>(__sb), 

Modified: stdcxx/branches/4.3.x/include/istream.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/istream.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/istream.cc (original)
+++ stdcxx/branches/4.3.x/include/istream.cc Wed Jul  9 20:42:40 2008
@@ -44,7 +44,7 @@
     _STD::ios_base::iostate __err = _STD::ios_base::goodbit;
 
     // eat leading whitespace, catching exceptions from sentry
-    const _TYPENAME _STD::basic_istream<_CharT, _Traits>::sentry
+    const typename _STD::basic_istream<_CharT, _Traits>::sentry
         __ipfx (__strm /* , noskipws = false */);
 
     if (__ipfx) {
@@ -150,7 +150,7 @@
 
 
 template<class _CharT, class _Traits>
-_TYPENAME basic_istream<_CharT, _Traits>::int_type
+typename basic_istream<_CharT, _Traits>::int_type
 basic_istream<_CharT, _Traits>::
 _C_unsafe_get (streamsize *__cnt   /* = 0     */,               
                int_type    __delim /* = eof() */,
@@ -447,7 +447,7 @@
 
 
 template<class _CharT, class _Traits>
-_TYPENAME basic_istream<_CharT, _Traits>::pos_type
+typename basic_istream<_CharT, _Traits>::pos_type
 basic_istream<_CharT, _Traits>::
 tellg ()
 {

Modified: stdcxx/branches/4.3.x/include/list
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/list?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/list (original)
+++ stdcxx/branches/4.3.x/include/list Wed Jul  9 20:42:40 2008
@@ -76,10 +76,10 @@
 
 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::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;
 
     // const_pointer and const_reference must be explicity typedef'ed to
     // const value_type* and const value_type& since we don't know if
@@ -182,12 +182,12 @@
 
     typedef _TypeT                                    value_type;
     typedef _Allocator                                allocator_type;
-    typedef _TYPENAME allocator_type::reference       reference;
-    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::reference       reference;
+    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 __rw_list_node<value_type>                _C_list_node;
     typedef _C_list_node*                             _C_link_type;
 
@@ -262,15 +262,15 @@
     // Node buffer data structure
     struct _C_nodebuf {
         typedef _RWSTD_REBIND (allocator_type, _C_nodebuf) _C_alloc_type;
-        typedef _TYPENAME _C_alloc_type::pointer           _C_pointer;
+        typedef typename _C_alloc_type::pointer           _C_pointer;
 
         _C_pointer   _C_next_buf;
         size_type    _C_bufsize;
         _C_link_type _C_buffer;
     };
 
-    typedef _TYPENAME _C_nodebuf::_C_alloc_type _C_buf_alloc_type;
-    typedef _TYPENAME _C_nodebuf::_C_pointer    _C_buf_pointer;
+    typedef typename _C_nodebuf::_C_alloc_type _C_buf_alloc_type;
+    typedef typename _C_nodebuf::_C_pointer    _C_buf_pointer;
 
     void _C_add_buffer (bool);
     void _C_free_buffers ();
@@ -753,7 +753,7 @@
 
 
 template <class _TypeT, class _Allocator>
-inline _TYPENAME list<_TypeT, _Allocator>::iterator 
+inline typename list<_TypeT, _Allocator>::iterator 
 list<_TypeT, _Allocator>::insert (iterator __it, const_reference __x)
 {
     _RWSTD_ASSERT_RANGE (begin (), __it);
@@ -787,7 +787,7 @@
 
 
 template <class _TypeT, class _Allocator>
-inline _TYPENAME list<_TypeT, _Allocator>::iterator 
+inline typename list<_TypeT, _Allocator>::iterator 
 list<_TypeT, _Allocator>::erase (iterator __it)
 {
     _RWSTD_ASSERT_RANGE (begin (), __it);

Modified: stdcxx/branches/4.3.x/include/list.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/list.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/list.cc (original)
+++ stdcxx/branches/4.3.x/include/list.cc Wed Jul  9 20:42:40 2008
@@ -55,7 +55,7 @@
 
 
 template <class _TypeT, class _Allocator>
-_TYPENAME list<_TypeT, _Allocator>::iterator 
+typename list<_TypeT, _Allocator>::iterator 
 list<_TypeT, _Allocator>::erase (iterator __first, iterator __last)
 {
     _RWSTD_ASSERT_RANGE (begin (), __first);

Modified: stdcxx/branches/4.3.x/include/loc/_ctype.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_ctype.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_ctype.cc (original)
+++ stdcxx/branches/4.3.x/include/loc/_ctype.cc Wed Jul  9 20:42:40 2008
@@ -37,7 +37,7 @@
 
 
 template <class _CharT> 
-/* virtual */ const _TYPENAME ctype<_CharT>::char_type*
+/* virtual */ const typename ctype<_CharT>::char_type*
 ctype<_CharT>::
 do_is (const char_type *__lo, const char_type *__hi, mask *__m) const
 {
@@ -52,7 +52,7 @@
 
 
 template <class _CharT> 
-/* virtual */ const _TYPENAME ctype<_CharT>::char_type*
+/* virtual */ const typename ctype<_CharT>::char_type*
 ctype<_CharT>::
 do_scan_is (mask __m, const char_type *__lo, const char_type *__hi) const
 {
@@ -68,7 +68,7 @@
 
 
 template <class _CharT> 
-/* virtual */ const _TYPENAME ctype<_CharT>::char_type*
+/* virtual */ const typename ctype<_CharT>::char_type*
 ctype<_CharT>::
 do_scan_not (mask __m, const char_type *__lo, const char_type *__hi) const
 {
@@ -84,7 +84,7 @@
 
 
 template <class _CharT> 
-/* virtual */ const _TYPENAME ctype<_CharT>::char_type*
+/* virtual */ const typename ctype<_CharT>::char_type*
 ctype<_CharT>::
 do_toupper (char_type *__lo, const char_type *__hi) const
 {
@@ -99,7 +99,7 @@
 
 
 template <class _CharT> 
-/* virtual */ const _TYPENAME ctype<_CharT>::char_type*
+/* virtual */ const typename ctype<_CharT>::char_type*
 ctype<_CharT>::
 do_tolower (char_type *__lo, const char_type *__hi) const
 {
@@ -128,7 +128,7 @@
 
 
 template <class _CharT> 
-/* virtual */ const _TYPENAME ctype<_CharT>::char_type*
+/* virtual */ const typename ctype<_CharT>::char_type*
 ctype<_CharT>::
 do_narrow (const char_type *__lo, const char_type *__hi,
            char __dfault, char *__dest) const

Modified: stdcxx/branches/4.3.x/include/loc/_messages.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_messages.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_messages.cc (original)
+++ stdcxx/branches/4.3.x/include/loc/_messages.cc Wed Jul  9 20:42:40 2008
@@ -55,7 +55,7 @@
 
 
 template <class _CharT>
-_TYPENAME messages<_CharT>::string_type
+typename messages<_CharT>::string_type
 messages<_CharT>::do_get (messages_base::catalog __cat,
                           int                    __set,
                           int                    __msgid,
@@ -67,7 +67,7 @@
         typedef _STD::codecvt<_CharT, char, _RWSTD_MBSTATE_T>
             _CodeCvt;
 
-        typedef _TYPENAME _CodeCvt::state_type state_type;
+        typedef typename _CodeCvt::state_type state_type;
 
         const _CodeCvt& __codecvt =
             _RWSTD_USE_FACET (_CodeCvt, _RW::__rw_get_locale (__cat));

Modified: stdcxx/branches/4.3.x/include/loc/_money_get.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_money_get.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_money_get.cc (original)
+++ stdcxx/branches/4.3.x/include/loc/_money_get.cc Wed Jul  9 20:42:40 2008
@@ -53,7 +53,7 @@
 
 
 template <class _CharT, class _InputIter>
-_TYPENAME money_get<_CharT, _InputIter>::iter_type
+typename money_get<_CharT, _InputIter>::iter_type
 money_get<_CharT, _InputIter>::
 _C_get (iter_type __it, iter_type __end, bool __intl, ios_base &__flags,
         _RWSTD_IOSTATE &__err, void *__pval, string_type *__pstr) const
@@ -86,7 +86,7 @@
     char __buf [304];
     char *__pcur = __buf;
 
-    typedef _TYPENAME string_type::traits_type _Traits;
+    typedef typename string_type::traits_type _Traits;
 
     char __grpbuf [sizeof __buf];    // holds sizes of discovered groups
     char       *__pgrp = __grpbuf;   // current group

Modified: stdcxx/branches/4.3.x/include/loc/_money_put.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_money_put.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_money_put.cc (original)
+++ stdcxx/branches/4.3.x/include/loc/_money_put.cc Wed Jul  9 20:42:40 2008
@@ -52,7 +52,7 @@
 
 
 template <class _CharT, class _OutputIter>
-/* private */ _TYPENAME money_put<_CharT, _OutputIter>::iter_type
+/* private */ typename money_put<_CharT, _OutputIter>::iter_type
 money_put<_CharT, _OutputIter>::
 _C_put (iter_type __it, int __opts, ios_base &__flags, char_type __fill,
         const char_type *__s, _RWSTD_SIZE_T __n, int __fd,
@@ -284,7 +284,7 @@
 
 
 template <class _CharT, class _OutputIter>
-/* virtual */ _TYPENAME money_put<_CharT, _OutputIter>::iter_type
+/* virtual */ typename money_put<_CharT, _OutputIter>::iter_type
 money_put<_CharT, _OutputIter>::
 do_put (iter_type __i, bool __intl, ios_base &__flags, char_type __fill,
         long double __val) const
@@ -334,7 +334,7 @@
 
 
 template <class _CharT, class _OutputIter>
-/* virtual */ _TYPENAME money_put<_CharT, _OutputIter>::iter_type
+/* virtual */ typename money_put<_CharT, _OutputIter>::iter_type
 money_put<_CharT, _OutputIter>::
 do_put (iter_type __i, bool __intl, ios_base &__flags, char_type __fill,
         const string_type &__str) const
@@ -365,7 +365,7 @@
     _RWSTD_SIZE_T  __strdigs = 0;          // number of digits in `str'
 
     typedef string::traits_type                   _Traits;
-    typedef _TYPENAME string_type::const_iterator _StringIter;
+    typedef typename string_type::const_iterator _StringIter;
 
     char        __buf [304];            // buffer for groups
     static char __nul    = '\0';        // `groups' must be non-0

Modified: stdcxx/branches/4.3.x/include/loc/_num_get.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_num_get.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_num_get.cc (original)
+++ stdcxx/branches/4.3.x/include/loc/_num_get.cc Wed Jul  9 20:42:40 2008
@@ -64,7 +64,7 @@
 #ifndef _RWSTD_NO_EXT_NUM_GET
 
 template <class _CharT, class _InputIter>
-_TYPENAME num_get<_CharT, _InputIter>::iter_type
+typename num_get<_CharT, _InputIter>::iter_type
 num_get<_CharT, _InputIter>::
 get (iter_type __begin, iter_type __end, ios_base &__flags, 
      _RWSTD_IOSTATE &__err, short &__val) const
@@ -83,7 +83,7 @@
 
 
 template <class _CharT, class _InputIter>
-_TYPENAME num_get<_CharT, _InputIter>::iter_type
+typename num_get<_CharT, _InputIter>::iter_type
 num_get<_CharT, _InputIter>::
 get (iter_type __begin, iter_type __end, ios_base &__flags, 
      _RWSTD_IOSTATE &__err, int &__val) const
@@ -106,7 +106,7 @@
 #ifndef _RWSTD_NO_NATIVE_BOOL
 
 template <class _CharT, class _InputIter /* = istreambuf_iterator<_CharT> */>
-_TYPENAME num_get<_CharT, _InputIter>::iter_type
+typename num_get<_CharT, _InputIter>::iter_type
 num_get<_CharT, _InputIter>::
 do_get (iter_type __begin, iter_type __end, ios_base &__flags,
         _RWSTD_IOSTATE &__err, bool &__val) const
@@ -172,7 +172,7 @@
 
 
 template <class _CharT, class _InputIter /* = istreambuf_iterator<_CharT> */>
-_TYPENAME num_get<_CharT, _InputIter>::iter_type
+typename num_get<_CharT, _InputIter>::iter_type
 num_get<_CharT, _InputIter>::
 _C_get (iter_type __begin, iter_type __end, ios_base &__flags,
         _RWSTD_IOSTATE &__err, int __type, void *__pval) const

Modified: stdcxx/branches/4.3.x/include/loc/_num_put.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_num_put.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_num_put.cc (original)
+++ stdcxx/branches/4.3.x/include/loc/_num_put.cc Wed Jul  9 20:42:40 2008
@@ -70,7 +70,7 @@
 
 
 template <class _CharT, class _OutputIter /* = ostreambuf_iterator<_CharT> */>
-_TYPENAME num_put<_CharT, _OutputIter>::iter_type
+typename num_put<_CharT, _OutputIter>::iter_type
 num_put<_CharT, _OutputIter>::
 _C_put (iter_type __it, ios_base &__flags, char_type __fill, int __type,
         const void *__pval) const

Modified: stdcxx/branches/4.3.x/include/loc/_numpunct.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_numpunct.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_numpunct.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_numpunct.h Wed Jul  9 20:42:40 2008
@@ -136,7 +136,7 @@
 
 
 template <class _CharT>
-inline _TYPENAME numpunct<_CharT>::char_type
+inline typename numpunct<_CharT>::char_type
 numpunct<_CharT>::decimal_point () const
 {
     if (!(_C_flags & _RW::__rw_dp)) {
@@ -154,7 +154,7 @@
 
 
 template <class _CharT>
-inline _TYPENAME numpunct<_CharT>::char_type
+inline typename numpunct<_CharT>::char_type
 numpunct<_CharT>::thousands_sep () const
 {
     if (!(_C_flags & _RW::__rw_ts)) {
@@ -189,7 +189,7 @@
 
 
 template <class _CharT>
-inline _TYPENAME numpunct<_CharT>::string_type
+inline typename numpunct<_CharT>::string_type
 numpunct<_CharT>::truename () const
 {
     if (!(_C_flags & _RW::__rw_tn)) {
@@ -207,7 +207,7 @@
 
 
 template <class _CharT>
-inline _TYPENAME numpunct<_CharT>::string_type
+inline typename numpunct<_CharT>::string_type
 numpunct<_CharT>::falsename () const
 {
     if (!(_C_flags & _RW::__rw_fn)) {

Modified: stdcxx/branches/4.3.x/include/loc/_time_get.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_time_get.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_time_get.cc (original)
+++ stdcxx/branches/4.3.x/include/loc/_time_get.cc Wed Jul  9 20:42:40 2008
@@ -51,7 +51,7 @@
 
 
 template <class _CharT, class _InputIter>
-_TYPENAME time_get<_CharT, _InputIter>::iter_type
+typename time_get<_CharT, _InputIter>::iter_type
 time_get<_CharT, _InputIter>::
 get (iter_type __it, iter_type __end, ios_base &__fl, _RWSTD_IOSTATE &__err,
      tm *__tmb, const char_type *__pat, const char_type *__pat_end) const
@@ -121,7 +121,7 @@
 
 
 template <class _CharT, class _InputIter>
-/* virtual */ _TYPENAME time_get<_CharT, _InputIter>::iter_type
+/* virtual */ typename time_get<_CharT, _InputIter>::iter_type
 time_get<_CharT, _InputIter>::
 do_get (iter_type __it, iter_type __end, ios_base &__fl,
         _RWSTD_IOSTATE &__err, tm *__tmb,

Modified: stdcxx/branches/4.3.x/include/loc/_time_put.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_time_put.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_time_put.cc (original)
+++ stdcxx/branches/4.3.x/include/loc/_time_put.cc Wed Jul  9 20:42:40 2008
@@ -61,7 +61,7 @@
 
 
 template <class _CharT, class _OutputIter /* = ostreambuf_iterator<_CharT> */ >
-/* virtual */ _TYPENAME time_put<_CharT, _OutputIter>::iter_type
+/* virtual */ typename time_put<_CharT, _OutputIter>::iter_type
 time_put<_CharT, _OutputIter>::
 do_put (iter_type __it, ios_base &__flags, char_type __fill,
         const tm *__tmb, char __fmt, char __modifier /* = 0 */) const
@@ -98,7 +98,7 @@
 
 
 template <class _CharT, class _OutputIter /* = ostreambuf_iterator<_CharT> */ >
-_TYPENAME time_put<_CharT, _OutputIter>::iter_type
+typename time_put<_CharT, _OutputIter>::iter_type
 time_put<_CharT, _OutputIter>::
 put (iter_type __it, ios_base &__flags, char_type __fill, const tm *__tmb,
      const char_type *__pat, const char_type *__end) const

Modified: stdcxx/branches/4.3.x/include/map
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/map?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/map (original)
+++ stdcxx/branches/4.3.x/include/map Wed Jul  9 20:42:40 2008
@@ -90,16 +90,16 @@
 
 public:
 
-    typedef _TYPENAME _C_repT::reference              reference;
-    typedef _TYPENAME _C_repT::const_reference        const_reference;
-    typedef _TYPENAME _C_repT::iterator               iterator;
-    typedef _TYPENAME _C_repT::const_iterator         const_iterator;
-    typedef _TYPENAME _C_repT::size_type              size_type;
-    typedef _TYPENAME _C_repT::difference_type        difference_type;
-    typedef _TYPENAME _C_repT::pointer                pointer;
-    typedef _TYPENAME _C_repT::const_pointer          const_pointer;
-    typedef _TYPENAME _C_repT::reverse_iterator       reverse_iterator;
-    typedef _TYPENAME _C_repT::const_reverse_iterator const_reverse_iterator;
+    typedef typename _C_repT::reference              reference;
+    typedef typename _C_repT::const_reference        const_reference;
+    typedef typename _C_repT::iterator               iterator;
+    typedef typename _C_repT::const_iterator         const_iterator;
+    typedef typename _C_repT::size_type              size_type;
+    typedef typename _C_repT::difference_type        difference_type;
+    typedef typename _C_repT::pointer                pointer;
+    typedef typename _C_repT::const_pointer          const_pointer;
+    typedef typename _C_repT::reverse_iterator       reverse_iterator;
+    typedef typename _C_repT::const_reverse_iterator const_reverse_iterator;
 
     struct value_compare: binary_function<value_type, value_type, bool> {
         // explicitly specified template arg-list below
@@ -298,16 +298,16 @@
 
 public:
 
-    typedef _TYPENAME _C_repT::reference              reference;
-    typedef _TYPENAME _C_repT::const_reference        const_reference;
-    typedef _TYPENAME _C_repT::iterator               iterator;
-    typedef _TYPENAME _C_repT::const_iterator         const_iterator; 
-    typedef _TYPENAME _C_repT::size_type              size_type;
-    typedef _TYPENAME _C_repT::difference_type        difference_type;
-    typedef _TYPENAME _C_repT::pointer                pointer;
-    typedef _TYPENAME _C_repT::const_pointer          const_pointer; 
-    typedef _TYPENAME _C_repT::reverse_iterator       reverse_iterator;
-    typedef _TYPENAME _C_repT::const_reverse_iterator const_reverse_iterator;
+    typedef typename _C_repT::reference              reference;
+    typedef typename _C_repT::const_reference        const_reference;
+    typedef typename _C_repT::iterator               iterator;
+    typedef typename _C_repT::const_iterator         const_iterator; 
+    typedef typename _C_repT::size_type              size_type;
+    typedef typename _C_repT::difference_type        difference_type;
+    typedef typename _C_repT::pointer                pointer;
+    typedef typename _C_repT::const_pointer          const_pointer; 
+    typedef typename _C_repT::reverse_iterator       reverse_iterator;
+    typedef typename _C_repT::const_reverse_iterator const_reverse_iterator;
 
     struct value_compare: binary_function<value_type, value_type, bool> {
         // explicitly specified template arg-list below

Modified: stdcxx/branches/4.3.x/include/ostream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/ostream?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/ostream (original)
+++ stdcxx/branches/4.3.x/include/ostream Wed Jul  9 20:42:40 2008
@@ -63,9 +63,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;
       
     typedef basic_ios<char_type, traits_type>  ios_type;
 

Modified: stdcxx/branches/4.3.x/include/ostream.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/ostream.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/ostream.cc (original)
+++ stdcxx/branches/4.3.x/include/ostream.cc Wed Jul  9 20:42:40 2008
@@ -112,7 +112,7 @@
 
 
 template<class _CharT, class _Traits>
-_TYPENAME basic_ostream<_CharT, _Traits>::pos_type
+typename basic_ostream<_CharT, _Traits>::pos_type
 basic_ostream<_CharT, _Traits>::tellp ()
 {
     _RWSTD_ASSERT (0 != this->rdbuf ());

Modified: stdcxx/branches/4.3.x/include/queue
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/queue?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/queue (original)
+++ stdcxx/branches/4.3.x/include/queue Wed Jul  9 20:42:40 2008
@@ -76,11 +76,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:
 
@@ -174,17 +174,17 @@
 
 template<class _TypeT,
          class _Container = vector<_TypeT>,
-         class _Compare = less<_TYPENAME _Container::value_type> >
+         class _Compare = less<typename _Container::value_type> >
 class priority_queue
 {
 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/rw/_algobase.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_algobase.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_algobase.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_algobase.h Wed Jul  9 20:42:40 2008
@@ -193,8 +193,8 @@
     // accommodate _FwdIter::operator*() that returns an rvalue that
     // doesn't bind to a non-const reference e.g., vector<bool>::reference
 
-    _TYPENAME iterator_traits<_FwdIter1>::reference __ref1 (*__a);
-    _TYPENAME iterator_traits<_FwdIter2>::reference __ref2 (*__b);
+    typename iterator_traits<_FwdIter1>::reference __ref1 (*__a);
+    typename iterator_traits<_FwdIter2>::reference __ref2 (*__b);
 
     _RW::__rw_swap (__ref1, __ref2);
 

Modified: stdcxx/branches/4.3.x/include/rw/_allocator.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_allocator.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_allocator.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_allocator.h Wed Jul  9 20:42:40 2008
@@ -301,8 +301,8 @@
     typedef const value_type*                         const_pointer;
     typedef value_type&                               reference;
     typedef const value_type&                         const_reference;
-    typedef _TYPENAME allocator_type::size_type       size_type;
-    typedef _TYPENAME allocator_type::difference_type difference_type;
+    typedef typename allocator_type::size_type       size_type;
+    typedef typename allocator_type::difference_type difference_type;
 
 protected:
     allocator_type _C_alloc;

Modified: stdcxx/branches/4.3.x/include/rw/_autoptr.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_autoptr.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_autoptr.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_autoptr.h Wed Jul  9 20:42:40 2008
@@ -184,7 +184,7 @@
 #endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
     // 20.4.5.2, p1
-    _TYPENAME _RW::__rw_nonvoid_ref<element_type>::_C_ref
+    typename _RW::__rw_nonvoid_ref<element_type>::_C_ref
     operator* () const _THROWS (()) {
         _RWSTD_ASSERT (0 != get ());
         return *get (); 

Modified: stdcxx/branches/4.3.x/include/rw/_basic_ios.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_basic_ios.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_basic_ios.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_basic_ios.h Wed Jul  9 20:42:40 2008
@@ -77,9 +77,9 @@
 
     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::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;
 
 protected:
 
@@ -248,7 +248,7 @@
 
 
 template<class _CharT, class _Traits>
-inline _TYPENAME basic_ios<_CharT, _Traits>::char_type
+inline typename basic_ios<_CharT, _Traits>::char_type
 basic_ios<_CharT, _Traits>::fill () const
 {
     // delayed initialization used to allow objects of stream types other
@@ -263,7 +263,7 @@
 
 
 template<class _CharT, class _Traits>
-inline _TYPENAME basic_ios<_CharT, _Traits>::char_type
+inline typename basic_ios<_CharT, _Traits>::char_type
 basic_ios<_CharT, _Traits>::fill (char_type __ch)
 {
     // convert to int type before swapping

Modified: stdcxx/branches/4.3.x/include/rw/_defs.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_defs.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_defs.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_defs.h Wed Jul  9 20:42:40 2008
@@ -494,13 +494,6 @@
 #endif // _RWSTD_NO_BOOL
 
 
-#ifndef _RWSTD_NO_TYPENAME
-#  define _TYPENAME   typename
-#else
-#  define _TYPENAME   /* empty */
-#endif
-
-
 #ifndef _RWSTD_NO_EXPLICIT
 #  define _EXPLICIT   explicit
 #else
@@ -896,10 +889,10 @@
 #ifdef _RWSTD_ALLOCATOR
 #  ifndef _RWSTD_NO_DEPENDENT_TEMPLATE
 #    define _RWSTD_REBIND(from, to) \
-            _TYPENAME from::template rebind < to >::other
+            typename from::template rebind < to >::other
 #  else
 #    define _RWSTD_REBIND(from, to) \
-            _TYPENAME from:: rebind < to >::other
+            typename from:: rebind < to >::other
 #  endif   // _RWSTD_NO_DEPENDENT_TEMPLATE
 
 #  define _RWSTD_ALLOC_TYPE(Allocator, ignore)        \
@@ -1044,30 +1037,30 @@
 // _Iterator typedefs
 // (note that you must use a semi-colon at the end of this macro)
 #define _RWSTD_ITERATOR_TYPES(_Iterator)                               \
-     typedef _TYPENAME _Iterator::difference_type difference_type;     \
-     typedef _TYPENAME _Iterator::value_type value_type;               \
-     typedef _TYPENAME _Iterator::pointer pointer;                     \
-     typedef _TYPENAME _Iterator::reference reference;                 \
-     typedef _TYPENAME _Iterator::iterator_category iterator_category
+     typedef typename _Iterator::difference_type difference_type;     \
+     typedef typename _Iterator::value_type value_type;               \
+     typedef typename _Iterator::pointer pointer;                     \
+     typedef typename _Iterator::reference reference;                 \
+     typedef typename _Iterator::iterator_category iterator_category
 
 // helpers making working w/o iterator_traits transparent
 #ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
 
 #  define _RWSTD_VALUE_TYPE(iterT) \
-       (_TYPENAME _STD::iterator_traits< iterT >::value_type*)0
+       (typename _STD::iterator_traits< iterT >::value_type*)0
 #  define _RWSTD_DIFFERENCE_TYPE(iterT)   \
-       (_TYPENAME _STD::iterator_traits< iterT >::difference_type*)0
+       (typename _STD::iterator_traits< iterT >::difference_type*)0
 
 #  if defined (SNI) || defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x530
      // hacking around the inability of Siemens CDS++ and SunPro 5.3
      // to use the ctor syntax for type-dependent nested type names
 #    define _RWSTD_ITERATOR_CATEGORY(iterT, ignore) \
-         (const _TYPENAME _STD::iterator_traits< iterT >::iterator_category&) \
+         (const typename _STD::iterator_traits< iterT >::iterator_category&) \
          (_STD::forward_iterator_tag ())
 
 #  else
 #    define _RWSTD_ITERATOR_CATEGORY(iterT, ignore) \
-         _TYPENAME _STD::iterator_traits< iterT >::iterator_category ()
+         typename _STD::iterator_traits< iterT >::iterator_category ()
 #  endif
 
 #  define _RWSTD_REVERSE_ITERATOR(iterT, ign1, ign2, ign3) \

Modified: stdcxx/branches/4.3.x/include/rw/_forward.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_forward.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_forward.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_forward.h Wed Jul  9 20:42:40 2008
@@ -59,14 +59,14 @@
 
 template <class _TypeT>
 inline _TypeT&&
-forward (_TYPENAME identity<_TypeT>::type&& __x)
+forward (typename identity<_TypeT>::type&& __x)
 {
     return __x;
 }
 
 
 template <class _TypeT>
-inline _TYPENAME _RWSTD_REMOVE_REFERENCE(_TypeT)&&
+inline typename _RWSTD_REMOVE_REFERENCE(_TypeT)&&
 move (_TypeT&& __x)
 {
     return __x;

Modified: stdcxx/branches/4.3.x/include/rw/_funcbase.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_funcbase.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_funcbase.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_funcbase.h Wed Jul  9 20:42:40 2008
@@ -61,8 +61,8 @@
 
 
 #define _RWSTD_UNARY_FUNCTION_TYPES(T, U)                                    \
-  typedef _TYPENAME _STD::unary_function<T, U>::argument_type argument_type; \
-  typedef _TYPENAME _STD::unary_function<T, U>::result_type   result_type
+  typedef typename _STD::unary_function<T, U>::argument_type argument_type; \
+  typedef typename _STD::unary_function<T, U>::result_type   result_type
 
 
 template <class _Arg1, class _Arg2, class _Result>
@@ -75,11 +75,11 @@
 
 
 #define _RWSTD_BINARY_FUNCTION_TYPES(T, U, V)                              \
-  typedef _TYPENAME _STD::binary_function<T, U, V>::second_argument_type   \
+  typedef typename _STD::binary_function<T, U, V>::second_argument_type   \
           second_argument_type;                                            \
-  typedef _TYPENAME _STD::binary_function<T, U, V>::first_argument_type    \
+  typedef typename _STD::binary_function<T, U, V>::first_argument_type    \
           first_argument_type;                                             \
-  typedef _TYPENAME _STD::binary_function<T, U, V>::result_type            \
+  typedef typename _STD::binary_function<T, U, V>::result_type            \
           result_type
 
 

Modified: stdcxx/branches/4.3.x/include/rw/_ioinsert.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_ioinsert.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_ioinsert.cc (original)
+++ stdcxx/branches/4.3.x/include/rw/_ioinsert.cc Wed Jul  9 20:42:40 2008
@@ -39,7 +39,7 @@
 __rw_insert (_STD::basic_ostream<_CharT, _Traits> &__strm,
              _NativeType                           __val)
 {
-    const _TYPENAME _STD::basic_ostream<_CharT, _Traits>::sentry
+    const typename _STD::basic_ostream<_CharT, _Traits>::sentry
         __opfx (__strm);
 
     _TRY {
@@ -75,7 +75,7 @@
     _RWSTD_ASSERT (!__len || __len > 0 && 0 != __s);
 
     if (1 == __len) {
-        typedef _TYPENAME _Traits::int_type _IntT;
+        typedef typename _Traits::int_type _IntT;
 
         const _IntT __ic = __strm.rdbuf ()->sputc (*__s);
 
@@ -100,7 +100,7 @@
 
     for (_RWSTD_STREAMSIZE __i = 0; __i < __len; ++__i) {
 
-        typedef _TYPENAME _Traits::int_type _IntT;
+        typedef typename _Traits::int_type _IntT;
 
         const _IntT __ic = __strm.rdbuf ()->sputc (__ctp.widen (__s [__i]));
 
@@ -133,7 +133,7 @@
 
     _TRY {
   
-        const _TYPENAME _STD::basic_ostream<_CharT, _Traits>::sentry
+        const typename _STD::basic_ostream<_CharT, _Traits>::sentry
             __opfx (__strm);
 
         if (__opfx) {
@@ -142,7 +142,7 @@
             // according to the rules described in 22.2.2.2.2, p19
             const _RWSTD_STREAMSIZE __pad = __width - __len;
 
-            typedef _TYPENAME
+            typedef typename
                 __rw_same_type<_CharT, _StringT>::_C_type _Same;
 
             if (__pad > 0) {

Modified: stdcxx/branches/4.3.x/include/rw/_ioiter.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_ioiter.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_ioiter.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_ioiter.h Wed Jul  9 20:42:40 2008
@@ -59,11 +59,11 @@
 template <class _CharT, class _Traits>
 struct istreambuf_iterator
     : iterator<input_iterator_tag, _CharT, 
-               _TYPENAME _Traits::off_type, _CharT*, _CharT&>
+               typename _Traits::off_type, _CharT*, _CharT&>
 {
     typedef _CharT                                  char_type;
     typedef _Traits                                 traits_type;
-    typedef _TYPENAME traits_type::int_type         int_type;
+    typedef typename traits_type::int_type         int_type;
     typedef basic_streambuf<char_type, traits_type> streambuf_type;
     typedef basic_istream<char_type, traits_type>   istream_type;
 
@@ -135,7 +135,7 @@
 
 
 template <class _CharT, class _Traits>
-inline _TYPENAME istreambuf_iterator<_CharT, _Traits>::char_type
+inline typename istreambuf_iterator<_CharT, _Traits>::char_type
 istreambuf_iterator<_CharT, _Traits>::
 operator*() const
 {
@@ -161,7 +161,7 @@
 
 
 template <class _CharT, class _Traits>
-inline _TYPENAME istreambuf_iterator<_CharT, _Traits>::_C_proxy 
+inline typename istreambuf_iterator<_CharT, _Traits>::_C_proxy 
 istreambuf_iterator<_CharT, _Traits>::
 operator++(int)
 {

Modified: stdcxx/branches/4.3.x/include/rw/_iterator.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_iterator.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_iterator.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_iterator.h Wed Jul  9 20:42:40 2008
@@ -62,7 +62,7 @@
 #  define _RWSTD_ITER_TEMPLATE template <class _Iterator>
 #  define _RWSTD_ITER_ID(i)    i <_Iterator>
 #  define _RWSTD_ITER_DIFF_TYPE(i, ignore)                             \
-          _TYPENAME iterator_traits<_Iterator>::difference_type
+          typename iterator_traits<_Iterator>::difference_type
 #else
 #  define _RWSTD_ITER_TEMPLATE                                         \
           template <class _Iterator, class _Category, class _TypeT,    \
@@ -77,18 +77,18 @@
 
 template <class _Iterator>
 class reverse_iterator
-    : public iterator<_TYPENAME iterator_traits<_Iterator>::iterator_category, 
-                      _TYPENAME iterator_traits<_Iterator>::value_type, 
-                      _TYPENAME iterator_traits<_Iterator>::difference_type,
-                      _TYPENAME iterator_traits<_Iterator>::pointer, 
-                      _TYPENAME iterator_traits<_Iterator>::reference>
+    : public iterator<typename iterator_traits<_Iterator>::iterator_category, 
+                      typename iterator_traits<_Iterator>::value_type, 
+                      typename iterator_traits<_Iterator>::difference_type,
+                      typename iterator_traits<_Iterator>::pointer, 
+                      typename iterator_traits<_Iterator>::reference>
 {
     typedef iterator_traits<_Iterator>             traits_type;
 public:
-    typedef _TYPENAME traits_type::difference_type difference_type;
-    typedef _TYPENAME traits_type::value_type      value_type;
-    typedef _TYPENAME traits_type::pointer         pointer;
-    typedef _TYPENAME traits_type::reference       reference;
+    typedef typename traits_type::difference_type difference_type;
+    typedef typename traits_type::value_type      value_type;
+    typedef typename traits_type::pointer         pointer;
+    typedef typename traits_type::reference       reference;
 
 #else   // if defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
 
@@ -401,10 +401,10 @@
    // necessary to allow __iterator_category, __value_type, etc. to work
 #  define _RWSTD_INSERT_ITERATOR_BASE(cont)         \
           iterator<output_iterator_tag,             \
-                   _TYPENAME cont::value_type,      \
-                   _TYPENAME cont::difference_type, \
-                   _TYPENAME cont::pointer,         \
-                   _TYPENAME cont::reference>
+                   typename cont::value_type,      \
+                   typename cont::difference_type, \
+                   typename cont::pointer,         \
+                   typename cont::reference>
 #endif   // _RWSTD_NO_CLASS_PARTIAL_SPEC
 
 
@@ -418,7 +418,7 @@
         : container (&__rhs) { }
 
     back_insert_iterator&
-    operator= (_TYPENAME container_type::const_reference __x) {
+    operator= (typename container_type::const_reference __x) {
         return container->push_back (__x), *this;
     }
 
@@ -457,7 +457,7 @@
         : container (&__rhs) { }
 
     front_insert_iterator&
-    operator= (_TYPENAME container_type::const_reference __x) { 
+    operator= (typename container_type::const_reference __x) { 
         return container->push_front (__x), *this;
     }
 
@@ -493,11 +493,11 @@
     typedef _Container container_type;
 
     insert_iterator (container_type                    &__x,
-                     _TYPENAME container_type::iterator __it)
+                     typename container_type::iterator __it)
       : iter (__it), container (&__x) { }
 
     insert_iterator&
-    operator= (_TYPENAME container_type::const_reference __x) { 
+    operator= (typename container_type::const_reference __x) { 
         iter = container->insert (iter, __x);
         return ++iter, *this;
     }
@@ -516,7 +516,7 @@
 
 protected:
 
-    _TYPENAME container_type::iterator iter;
+    typename container_type::iterator iter;
     container_type*                    container;
 };
 
@@ -524,7 +524,7 @@
 template <class _Container, class _Iterator>
 inline insert_iterator<_Container> inserter (_Container& __x, _Iterator __it)
 {
-    typedef _TYPENAME _Container::iterator _Iter;
+    typedef typename _Container::iterator _Iter;
 
     return insert_iterator<_Container> (__x, _Iter (__it));
 }

Modified: stdcxx/branches/4.3.x/include/rw/_iterbase.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_iterbase.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_iterbase.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_iterbase.h Wed Jul  9 20:42:40 2008
@@ -57,11 +57,11 @@
 template <class _Iterator>
 struct iterator_traits
 {
-    typedef _TYPENAME _Iterator::value_type        value_type;
-    typedef _TYPENAME _Iterator::difference_type   difference_type;
-    typedef _TYPENAME _Iterator::pointer           pointer;
-    typedef _TYPENAME _Iterator::reference         reference;
-    typedef _TYPENAME _Iterator::iterator_category iterator_category;
+    typedef typename _Iterator::value_type        value_type;
+    typedef typename _Iterator::difference_type   difference_type;
+    typedef typename _Iterator::pointer           pointer;
+    typedef typename _Iterator::reference         reference;
+    typedef typename _Iterator::iterator_category iterator_category;
 };
 
 
@@ -128,7 +128,7 @@
 __iterator_category (const iterator<_Category, _TypeT,
                                     _Distance, _Pointer, _Reference>&)
 {
-    typedef _TYPENAME iterator<_Category, _TypeT, _Distance, _TypeT*,
+    typedef typename iterator<_Category, _TypeT, _Distance, _TypeT*,
                                _TypeT&>::iterator_category _IterCategory;
 
     return _IterCategory ();
@@ -187,7 +187,7 @@
 #ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
 
 template <class _Iterator>
-inline _TYPENAME iterator_traits<_Iterator>::value_type*
+inline typename iterator_traits<_Iterator>::value_type*
 __value_type (const _Iterator*)
 { 
     return 0;
@@ -216,7 +216,7 @@
 #ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
 
 template <class _Iterator>
-inline _TYPENAME iterator_traits<_Iterator>::difference_type*
+inline typename iterator_traits<_Iterator>::difference_type*
 __distance_type (_Iterator)
 { 
     return 0;
@@ -337,10 +337,10 @@
 
 // 24.3.4, p4
 template <class _ForwardIterator>
-inline _TYPENAME iterator_traits<_ForwardIterator>::difference_type
+inline typename iterator_traits<_ForwardIterator>::difference_type
 distance (_ForwardIterator __first, _ForwardIterator __last)
 {
-    _TYPENAME iterator_traits<_ForwardIterator>::difference_type __n = 0;
+    typename iterator_traits<_ForwardIterator>::difference_type __n = 0;
 
     __distance (__first, __last, __n,
                 _RWSTD_ITERATOR_CATEGORY (_ForwardIterator, __first));
@@ -408,11 +408,11 @@
 
 public:
 
-    typedef _TYPENAME traits_type::value_type         value_type;
-    typedef _TYPENAME traits_type::difference_type    difference_type;
-    typedef _TYPENAME traits_type::reference          reference;
-    typedef _TYPENAME traits_type::pointer            pointer;
-    typedef _TYPENAME traits_type::iterator_category  iterator_category;
+    typedef typename traits_type::value_type         value_type;
+    typedef typename traits_type::difference_type    difference_type;
+    typedef typename traits_type::reference          reference;
+    typedef typename traits_type::pointer            pointer;
+    typedef typename traits_type::iterator_category  iterator_category;
 
     typedef __rw_debug_iter <container_type, _MutableIterator,
                              _MutableIterator>        _C_mutable_iterator;
@@ -584,7 +584,7 @@
 
 
 #ifndef _RWSTD_NO_NONDEDUCED_CONTEXT
-# define _RWSTD_CONT_DIFF_TYPE _TYPENAME _Cont::difference_type 
+# define _RWSTD_CONT_DIFF_TYPE typename _Cont::difference_type 
 #else
 # define _RWSTD_CONT_DIFF_TYPE _RWSTD_PTRDIFF_T 
 #endif
@@ -615,7 +615,7 @@
 // and non-const iterators, respectively (allows symmetry)
 
 template <class _Cont, class _Iter1, class _Iter2, class _MutIter>
-inline _TYPENAME _Cont::difference_type
+inline typename _Cont::difference_type
 operator- (const _RW::__rw_debug_iter<_Cont, _Iter1, _MutIter> &__x,
            const _RW::__rw_debug_iter<_Cont, _Iter2, _MutIter> &__y)
 {

Modified: stdcxx/branches/4.3.x/include/rw/_select.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_select.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_select.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_select.h Wed Jul  9 20:42:40 2008
@@ -89,7 +89,7 @@
 
 #if !defined (__SUNPRO_CC) || __SUNPRO_CC > 0x530
 #  define _RWSTD_DISPATCH(iter)   \
-       (_TYPENAME _RW::__rw_select_int< iter >::_SelectT (1))
+       (typename _RW::__rw_select_int< iter >::_SelectT (1))
 
 #else
    // working around a SunPro 5.3 a prior bug (PR #28739)
@@ -141,7 +141,7 @@
     enum { _C_val = sizeof (test (_C_Type<_TypeT> (),
                                   _C_Type<_TypeU> ())) == sizeof (_C_yes) };
 
-    typedef _TYPENAME __rw_bool_t<_C_val>::_C_type _C_type;
+    typedef typename __rw_bool_t<_C_val>::_C_type _C_type;
 };
 
 #endif   // _RWSTD_NO_CLASS_PARTIAL_SPEC

Modified: stdcxx/branches/4.3.x/include/rw/_smartptr.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_smartptr.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_smartptr.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_smartptr.h Wed Jul  9 20:42:40 2008
@@ -312,7 +312,7 @@
         return _C_ptr;
     }
 
-    _TYPENAME _RW::__rw_nonvoid_ref<element_type>::_C_ref
+    typename _RW::__rw_nonvoid_ref<element_type>::_C_ref
     operator*() const {
         _RWSTD_ASSERT (0 != get ());
         return *get ();

Modified: stdcxx/branches/4.3.x/include/rw/_specialized.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_specialized.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_specialized.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_specialized.h Wed Jul  9 20:42:40 2008
@@ -56,7 +56,7 @@
 
 
 #ifndef _RWSTD_NO_NONDEDUCED_CONTEXT
-#  define _RWSTD_CONTAINER_SIZE_TYPE _TYPENAME _Container::size_type
+#  define _RWSTD_CONTAINER_SIZE_TYPE typename _Container::size_type
 #else
 #  define _RWSTD_CONTAINER_SIZE_TYPE _RWSTD_SIZE_T
 #endif   // _RWSTD_NO_NONDEDUCED_CONTEXT

Modified: stdcxx/branches/4.3.x/include/rw/_streamiter.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_streamiter.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_streamiter.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_streamiter.h Wed Jul  9 20:42:40 2008
@@ -79,7 +79,7 @@
     typedef basic_istream<char_type, traits_type> istream_type;
 
     // for convenience
-    typedef _TYPENAME _C_base::value_type         value_type;
+    typedef typename _C_base::value_type         value_type;
 
     // 24.5.1.1, p1
     istream_iterator (): _C_strm (0) { }

Modified: stdcxx/branches/4.3.x/include/rw/_stringio.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_stringio.cc?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_stringio.cc (original)
+++ stdcxx/branches/4.3.x/include/rw/_stringio.cc Wed Jul  9 20:42:40 2008
@@ -38,7 +38,7 @@
 {
     _RWSTD_ASSERT (0 != __is.rdbuf ());
 
-    const _TYPENAME basic_istream<_CharT, _Traits>::sentry
+    const typename basic_istream<_CharT, _Traits>::sentry
         __ipfx (__is /* , noskipws = false */);
 
     ios_base::iostate __err = ios_base::goodbit;
@@ -82,7 +82,7 @@
                     const _CharT* __pdel = __gptr;
                     for (/**/; __pdel != __egptr; ++__pdel) {
 
-                        const _TYPENAME _Traits::int_type
+                        const typename _Traits::int_type
                             __c = _Traits::to_int_type(*__pdel);
 
                         if (_Traits::eq_int_type (__c, _Traits::eof ())) {
@@ -134,7 +134,7 @@
 
                     // n data in buffer, trigger underflow()
                     // note that streambuf may be unbuffered
-                    const _TYPENAME _Traits::int_type
+                    const typename _Traits::int_type
                         __c = __rdbuf->sgetc ();
 
                     if (_Traits::eq_int_type (__c, _Traits::eof ())) {
@@ -143,7 +143,7 @@
                     }
 
                     // convert to char_type so that isspace works correctly
-                    const _TYPENAME _Traits::char_type
+                    const typename _Traits::char_type
                         __ch = _Traits::to_char_type (__c);
 
                     if (__ctp.is (__ctp.space, __ch))
@@ -166,7 +166,7 @@
 
             for ( ; __n != 0; ) {
 
-                const _TYPENAME _Traits::int_type
+                const typename _Traits::int_type
                     __c (__rdbuf->sgetc ());
 
                 if (_Traits::eq_int_type (__c, _Traits::eof ())) {
@@ -175,7 +175,7 @@
                 }
 
                 // convert to char_type so that isspace works correctly
-                const _TYPENAME _Traits::char_type
+                const typename _Traits::char_type
                     __ch = _Traits::to_char_type (__c);
 
                 if (__ctp.is (__ctp.space, __ch))
@@ -221,7 +221,7 @@
 {
     _RWSTD_ASSERT (0 != __is.rdbuf ());
 
-    const _TYPENAME basic_istream<_CharT, _Traits>::sentry
+    const typename basic_istream<_CharT, _Traits>::sentry
         __ipfx (__is, true /* noskipws */);
 
 #ifndef _RWSTD_NO_FRIEND_TEMPLATE
@@ -247,7 +247,7 @@
 
             for ( ; ; ) {
 
-                typedef _TYPENAME _Traits::int_type int_type;
+                typedef typename _Traits::int_type int_type;
 
                 const _CharT* const __gptr  = __rdbuf->gptr ();
                 const _CharT* const __egptr = __rdbuf->egptr ();
@@ -350,12 +350,12 @@
             // FIXME: code commented out to work around an HP aCC 3.14.10
             // bug #JAGac86264
 
-            // typedef _TYPENAME
+            // typedef typename
             //     basic_string<_CharT, _Traits, _Allocator>::size_type
 
             for ( ; ; ) {
 
-                const _TYPENAME _Traits::int_type
+                const typename _Traits::int_type
                     __c (__is.rdbuf ()->sgetc ());
 
                 if (_Traits::eq_int_type (__c, _Traits::eof ())) {

Modified: stdcxx/branches/4.3.x/include/rw/_strref.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_strref.h?rev=675429&r1=675428&r2=675429&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_strref.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_strref.h Wed Jul  9 20:42:40 2008
@@ -105,7 +105,7 @@
 {
     typedef _CharT                                            char_type;
     typedef _Allocator                                        allocator_type;
-    typedef _TYPENAME allocator_type::size_type               size_type;
+    typedef typename allocator_type::size_type               size_type;
     typedef _STD::basic_string<_CharT, _Traits, _Allocator>   string_type;
 
 #if     defined (_RWSTD_REENTRANT)              \



Mime
View raw message