From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Mon, 9 Aug 1999 00:07:05 +0000 (+0000)
Subject: pthread_alloc: Solaris' ctype.h defines _U to 01; use _Up as template parameter instead.
X-Git-Tag: releases/gcc-2.95.1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b82095e193c03704edc5e82097d7af1fa9ffcac;p=thirdparty%2Fgcc.git

pthread_alloc: Solaris' ctype.h defines _U to 01; use _Up as template parameter instead.

* pthread_alloc: Solaris' ctype.h defines _U to 01; use _Up as
template parameter instead.

From-SVN: r28603
---

diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index 39b8cba89819..3c8df484b822 100644
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug  8 21:06:16 1999  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* pthread_alloc: Solaris' ctype.h defines _U to 01; use _Up as
+	template parameter instead.
+
 Wed Jul 28 21:39:31 PDT 1999 Jeff Law  (law@cygnus.com)
 
 	* gcc-2.95 Released.
diff --git a/libstdc++/stl/pthread_alloc b/libstdc++/stl/pthread_alloc
index 887d8e8a1547..1852908095b0 100644
--- a/libstdc++/stl/pthread_alloc
+++ b/libstdc++/stl/pthread_alloc
@@ -376,13 +376,13 @@ public:
   typedef const _Tp& const_reference;
   typedef _Tp        value_type;
 
-  template <class _U> struct rebind {
-    typedef pthread_allocator<_U> other;
+  template <class _Up> struct rebind {
+    typedef pthread_allocator<_Up> other;
   };
 
   pthread_allocator() __STL_NOTHROW {}
   pthread_allocator(const pthread_allocator& a) __STL_NOTHROW {}
-  template <class _U> pthread_allocator(const pthread_allocator<_U>&)
+  template <class _Up> pthread_allocator(const pthread_allocator<_Up>&)
 		__STL_NOTHROW {}
   ~pthread_allocator() __STL_NOTHROW {}
 
@@ -416,8 +416,8 @@ public:
   typedef const void* const_pointer;
   typedef void        value_type;
 
-  template <class _U> struct rebind {
-    typedef pthread_allocator<_U> other;
+  template <class _Up> struct rebind {
+    typedef pthread_allocator<_Up> other;
   };
 };
 
@@ -451,16 +451,16 @@ struct _Alloc_traits<_Tp, _Pthread_alloc_template<_Max_size> >
           allocator_type;
 };
 
-template <class _Tp, class _U, size_t _Max>
-struct _Alloc_traits<_Tp, __allocator<_U, _Pthread_alloc_template<_Max> > >
+template <class _Tp, class _Up, size_t _Max>
+struct _Alloc_traits<_Tp, __allocator<_Up, _Pthread_alloc_template<_Max> > >
 {
   static const bool _S_instanceless = true;
   typedef simple_alloc<_Tp, _Pthread_alloc_template<_Max> > _Alloc_type;
   typedef __allocator<_Tp, _Pthread_alloc_template<_Max> > allocator_type;
 };
 
-template <class _Tp, class _U>
-struct _Alloc_traits<_Tp, pthread_allocator<_U> >
+template <class _Tp, class _Up>
+struct _Alloc_traits<_Tp, pthread_allocator<_Up> >
 {
   static const bool _S_instanceless = true;
   typedef simple_alloc<_Tp, _Pthread_alloc_template<> > _Alloc_type;