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

template parameter instead.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28605 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index e1651a9..74b25a4 100644 (file)
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-08  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * pthread_alloc: Solaris' ctype.h defines _U to 01; use _Up as
+       template parameter instead.
+
 1999-06-18  Martin von Löwis  <loewis@informatik.hu-berlin.de>
 
        * stl_queue.h: Rename _M_c to c, and _M_comp to comp.

diff --git a/libstdc++/stl/pthread_alloc b/libstdc++/stl/pthread_alloc
index 887d8e8..1852908 100644 (file)
--- 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;