This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] fix for symbol conflicts with BSD's ctype.h
- To: gcc-patches at gcc dot gnu dot org
- Subject: [PATCH] fix for symbol conflicts with BSD's ctype.h
- From: "David O'Brien" <obrien at NUXI dot com>
- Date: Fri, 26 May 2000 17:29:45 -0700
- Organization: The NUXI BSD group
- Reply-To: obrien at NUXI dot com
----- Forwarded message from David O'Brien <obrien@dragon.nuxi.com> -----
From: David O'Brien <obrien@dragon.nuxi.com>
Subject: fix for symbol conflicts with BSD's ctype.h
Date: Fri, 4 Feb 2000 17:06:28 -0800
To: gcc-patches@gcc.gnu.org
Reply-To: obrien@nuxi.com
X-Mailer: Mutt 1.0i
X-Operating-System: FreeBSD 4.0-CURRENT
Organization: The NUXI BSD group
X-PGP-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A
X-Pgp-Keyid: 34F9F9D5
Parts of the libstdc++/std headers conflict with FreeBSD's ctype.h.
Ctype is traditionally implemented using #define's that are _<X> where
<X> is an upper case letter. 4.4BSD (4.3BSD?) has extended the typical
ctype offering and used "_T" as one of the character classes.
Problem is libstdc++/std also uses this in a few places in templets for
the instantiated type. This usage is inconsistent with most of
libstdc++/std which uses "_Tp".
2000-2-4 David E O'Brien <obrien@FreeBSD.org>
* std/mask_array.h (mask_array): Rename templet type
parameter to avoid conflicts with ctype.h on BSD systems.
* std/slice_array.h (slice_array): Likewise.
Index: mask_array.h
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++/std/mask_array.h,v
retrieving revision 1.2
diff -u -r1.2 mask_array.h
--- mask_array.h 1999/09/04 15:09:21 1.2
+++ mask_array.h 2000/02/04 13:03:36
@@ -34,54 +34,54 @@
extern "C++" {
-template <class _T> class mask_array
+template <class _Tp> class mask_array
{
public:
- typedef _T value_type;
+ typedef _Tp value_type;
- void operator= (const valarray<_T>&) const;
- void operator*= (const valarray<_T>&) const;
- void operator/= (const valarray<_T>&) const;
- void operator%= (const valarray<_T>&) const;
- void operator+= (const valarray<_T>&) const;
- void operator-= (const valarray<_T>&) const;
- void operator^= (const valarray<_T>&) const;
- void operator&= (const valarray<_T>&) const;
- void operator|= (const valarray<_T>&) const;
- void operator<<=(const valarray<_T>&) const;
- void operator>>=(const valarray<_T>&) const;
- void operator= (const _T&);
+ void operator= (const valarray<_Tp>&) const;
+ void operator*= (const valarray<_Tp>&) const;
+ void operator/= (const valarray<_Tp>&) const;
+ void operator%= (const valarray<_Tp>&) const;
+ void operator+= (const valarray<_Tp>&) const;
+ void operator-= (const valarray<_Tp>&) const;
+ void operator^= (const valarray<_Tp>&) const;
+ void operator&= (const valarray<_Tp>&) const;
+ void operator|= (const valarray<_Tp>&) const;
+ void operator<<=(const valarray<_Tp>&) const;
+ void operator>>=(const valarray<_Tp>&) const;
+ void operator= (const _Tp&);
template<class _Dom>
- void operator= (const _Expr<_Dom,_T>&) const;
+ void operator= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator*= (const _Expr<_Dom,_T>&) const;
+ void operator*= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator/= (const _Expr<_Dom,_T>&) const;
+ void operator/= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator%= (const _Expr<_Dom,_T>&) const;
+ void operator%= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator+= (const _Expr<_Dom,_T>&) const;
+ void operator+= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator-= (const _Expr<_Dom,_T>&) const;
+ void operator-= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator^= (const _Expr<_Dom,_T>&) const;
+ void operator^= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator&= (const _Expr<_Dom,_T>&) const;
+ void operator&= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator|= (const _Expr<_Dom,_T>&) const;
+ void operator|= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator<<=(const _Expr<_Dom,_T>&) const;
+ void operator<<=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator>>=(const _Expr<_Dom,_T>&) const;
+ void operator>>=(const _Expr<_Dom,_Tp>&) const;
private:
- mask_array (_Array<_T>, size_t, _Array<bool>);
- friend class valarray<_T>;
+ mask_array (_Array<_Tp>, size_t, _Array<bool>);
+ friend class valarray<_Tp>;
const size_t _M_sz;
const _Array<bool> _M_mask;
- const _Array<_T> _M_array;
+ const _Array<_Tp> _M_array;
mask_array (const mask_array&);
@@ -94,40 +94,40 @@
inline mask_array<_Tp>::mask_array (const mask_array<_Tp>& a)
: _M_sz (a._M_sz), _M_mask (a._M_mask), _M_array (a._M_array) {}
-template<typename _T>
+template<typename _Tp>
inline
-mask_array<_T>::mask_array (_Array<_T> __a, size_t __s, _Array<bool> __m)
+mask_array<_Tp>::mask_array (_Array<_Tp> __a, size_t __s, _Array<bool> __m)
: _M_sz (__s), _M_mask (__m), _M_array (__a) {}
-template<typename _T>
+template<typename _Tp>
inline void
-mask_array<_T>::operator= (const _T& __t)
+mask_array<_Tp>::operator= (const _Tp& __t)
{ __valarray_fill (_M_array, _M_sz, _M_mask, __t); }
-template<typename _T>
+template<typename _Tp>
inline void
-mask_array<_T>::operator= (const valarray<_T>& __v) const
-{ __valarray_copy (_Array<_T> (__v), __v.size (), _M_array, _M_mask); }
+mask_array<_Tp>::operator= (const valarray<_Tp>& __v) const
+{ __valarray_copy (_Array<_Tp> (__v), __v.size (), _M_array, _M_mask); }
-template<typename _T>
+template<typename _Tp>
template<class E>
inline void
-mask_array<_T>::operator= (const _Expr<E, _T>& __e) const
+mask_array<_Tp>::operator= (const _Expr<E, _Tp>& __e) const
{ __valarray_copy (__e, __e.size (), _M_array, _M_mask); }
#undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(op, name) \
-template<typename _T> \
+template<typename _Tp> \
inline void \
-mask_array<_T>::operator##op##= (const valarray<_T>& __v) const \
+mask_array<_Tp>::operator##op##= (const valarray<_Tp>& __v) const \
{ \
_Array_augmented_##name (_M_array, _M_mask, \
- _Array<_T> (__v), __v.size ()); \
+ _Array<_Tp> (__v), __v.size ()); \
} \
\
-template<typename _T> template<class E> \
+template<typename _Tp> template<class E> \
inline void \
-mask_array<_T>::operator##op##= (const _Expr<E, _T>& __e) const \
+mask_array<_Tp>::operator##op##= (const _Expr<E, _Tp>& __e) const \
{ \
_Array_augmented_##name (_M_array, _M_mask, __e, __e.size ()); \
}
Index: slice_array.h
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++/std/slice_array.h,v
retrieving revision 1.2
diff -u -r1.2 slice_array.h
--- slice_array.h 1999/09/04 15:09:21 1.2
+++ slice_array.h 2000/02/04 13:03:36
@@ -34,55 +34,55 @@
extern "C++" {
-template<typename _T>
+template<typename _Tp>
class slice_array
{
public:
- typedef _T value_type;
+ typedef _Tp value_type;
- void operator= (const valarray<_T>&) const;
- void operator*= (const valarray<_T>&) const;
- void operator/= (const valarray<_T>&) const;
- void operator%= (const valarray<_T>&) const;
- void operator+= (const valarray<_T>&) const;
- void operator-= (const valarray<_T>&) const;
- void operator^= (const valarray<_T>&) const;
- void operator&= (const valarray<_T>&) const;
- void operator|= (const valarray<_T>&) const;
- void operator<<= (const valarray<_T>&) const;
- void operator>>= (const valarray<_T>&) const;
- void operator= (const _T &);
+ void operator= (const valarray<_Tp>&) const;
+ void operator*= (const valarray<_Tp>&) const;
+ void operator/= (const valarray<_Tp>&) const;
+ void operator%= (const valarray<_Tp>&) const;
+ void operator+= (const valarray<_Tp>&) const;
+ void operator-= (const valarray<_Tp>&) const;
+ void operator^= (const valarray<_Tp>&) const;
+ void operator&= (const valarray<_Tp>&) const;
+ void operator|= (const valarray<_Tp>&) const;
+ void operator<<= (const valarray<_Tp>&) const;
+ void operator>>= (const valarray<_Tp>&) const;
+ void operator= (const _Tp &);
template<class _Dom>
- void operator= (const _Expr<_Dom,_T>&) const;
+ void operator= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator*= (const _Expr<_Dom,_T>&) const;
+ void operator*= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator/= (const _Expr<_Dom,_T>&) const;
+ void operator/= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator%= (const _Expr<_Dom,_T>&) const;
+ void operator%= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator+= (const _Expr<_Dom,_T>&) const;
+ void operator+= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator-= (const _Expr<_Dom,_T>&) const;
+ void operator-= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator^= (const _Expr<_Dom,_T>&) const;
+ void operator^= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator&= (const _Expr<_Dom,_T>&) const;
+ void operator&= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator|= (const _Expr<_Dom,_T>&) const;
+ void operator|= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator<<= (const _Expr<_Dom,_T>&) const;
+ void operator<<= (const _Expr<_Dom,_Tp>&) const;
template<class _Dom>
- void operator>>= (const _Expr<_Dom,_T>&) const;
+ void operator>>= (const _Expr<_Dom,_Tp>&) const;
private:
- friend class valarray<_T>;
- slice_array(_Array<_T>, const slice&);
+ friend class valarray<_Tp>;
+ slice_array(_Array<_Tp>, const slice&);
const size_t _M_sz;
const size_t _M_stride;
- const _Array<_T> _M_array;
+ const _Array<_Tp> _M_array;
// this constructor is implemented since we need to return a value.
slice_array (const slice_array&);
@@ -92,8 +92,8 @@
slice_array& operator= (const slice_array&);
};
-template<typename _T>
-inline slice_array<_T>::slice_array (_Array<_T> __a, const slice& __s)
+template<typename _Tp>
+inline slice_array<_Tp>::slice_array (_Array<_Tp> __a, const slice& __s)
: _M_sz (__s.size ()), _M_stride (__s.stride ()),
_M_array (__a.begin () + __s.start ()) {}
@@ -101,34 +101,34 @@
inline slice_array<_Tp>::slice_array(const slice_array<_Tp>& a)
: _M_sz(a._M_sz), _M_stride(a._M_stride), _M_array(a._M_array) {}
-template<typename _T>
+template<typename _Tp>
inline void
-slice_array<_T>::operator= (const _T& __t)
+slice_array<_Tp>::operator= (const _Tp& __t)
{ __valarray_fill (_M_array, _M_sz, _M_stride, __t); }
-template<typename _T>
+template<typename _Tp>
inline void
-slice_array<_T>::operator= (const valarray<_T>& __v) const
-{ __valarray_copy (_Array<_T> (__v), _M_array, _M_sz, _M_stride); }
+slice_array<_Tp>::operator= (const valarray<_Tp>& __v) const
+{ __valarray_copy (_Array<_Tp> (__v), _M_array, _M_sz, _M_stride); }
-template<typename _T>
+template<typename _Tp>
template<class _Dom>
inline void
-slice_array<_T>::operator= (const _Expr<_Dom,_T>& __e) const
+slice_array<_Tp>::operator= (const _Expr<_Dom,_Tp>& __e) const
{ __valarray_copy (__e, _M_sz, _M_array, _M_stride); }
#undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(op, name) \
-template<typename _T> \
+template<typename _Tp> \
inline void \
-slice_array<_T>::operator##op##= (const valarray<_T>& __v) const \
+slice_array<_Tp>::operator##op##= (const valarray<_Tp>& __v) const \
{ \
- _Array_augmented_##name (_M_array, _M_sz, _M_stride, _Array<_T> (__v));\
+ _Array_augmented_##name (_M_array, _M_sz, _M_stride, _Array<_Tp> (__v));\
} \
\
-template<typename _T> template<class _Dom> \
+template<typename _Tp> template<class _Dom> \
inline void \
-slice_array<_T>::operator##op##= (const _Expr<_Dom,_T>& __e) const \
+slice_array<_Tp>::operator##op##= (const _Expr<_Dom,_Tp>& __e) const \
{ \
_Array_augmented_##name (_M_array, _M_stride, __e, _M_sz); \
}
----- End forwarded message -----