+2000-10-31 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
+
+ * include/bits/std_complex.h: Remove duplicate definition of conj.
+ * include/c/bits/std_cwctype.h: Consistent placement of undefs.
+
2000-10-31 Gabriel Dos Reis <gdr@codesourcery.com>
* src/complex.cc (arg, polar): Comment out specializations.
friend class complex<long double>;
// friend float abs<>(const complex<float>&);
-
friend complex<float> conj<>(const complex<float>&);
-
friend complex<float> cos<>(const complex<float>&);
friend complex<float> cosh<>(const complex<float>&);
friend complex<float> exp<>(const complex<float>&);
friend class complex<long double>;
// friend double abs<>(const complex<double>&);
-
friend complex<double> conj<>(const complex<double>&);
friend complex<double> cos<>(const complex<double>&);
friend complex<double> cosh<>(const complex<double>&);
friend class complex<double>;
// friend long double abs<>(const complex<long double>&);
-
friend complex<long double> conj<>(const complex<long double>&);
friend complex<long double> cos<>(const complex<long double>&);
friend complex<long double> cosh<>(const complex<long double>&);
complex<_Tp>::complex(const complex<_Up>& __z)
: _M_real(__z.real()), _M_imag(__z.imag()) { }
- // 26.2.7/6
- template<typename _Tp>
- inline complex<_Tp>
- conj(const complex<_Tp>& __z)
- { return complex<_Tp>(__z.real(), -__z.imag()); }
-
// 26.2.7/4
template<typename _Tp>
inline _Tp
polar(const _Tp& __rho, const _Tp& __theta)
{ return complex<_Tp>(__rho * cos(__theta), __rho * sin(__theta)); }
+ // 26.2.7/6
template<typename _Tp>
inline complex<_Tp>
conj(const complex<_Tp>& __z)
#pragma GCC system_header
#include_next <wctype.h>
-namespace std
-{
- using ::wctype_t;
- using ::wctrans_t;
-
- // Get rid of those macros defined in <wctype.h> in lieu of real functions.
+// Get rid of those macros defined in <wctype.h> in lieu of real functions.
#undef iswalnum
#undef iswalpha
#undef iswblank
#undef iswxdigit
#undef iswctype
+namespace std
+{
+ using ::wctype_t;
+ using ::wctrans_t;
+
extern "C" int iswalnum(wint_t);
extern "C" int iswalpha(wint_t);
extern "C" int iswblank(wint_t);