diff options
| author | Benjamin Kosnik <bkoz@purist.soma.redhat.com> | 2000-10-31 18:11:31 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-10-31 18:11:31 +0000 |
| commit | bc359d3a5d3e8e6a5ad489b9da8740c2cf7bf301 (patch) | |
| tree | e6df585ec2415ae62afae1072f6a77fb7bc137a5 /libstdc++-v3/include/c | |
| parent | 681cb2337b00d65d62f78e653d6808b74ded295d (diff) | |
| download | gcc-bc359d3a5d3e8e6a5ad489b9da8740c2cf7bf301.tar.gz | |
std_complex.h: Remove duplicate definition of conj.
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.
From-SVN: r37161
Diffstat (limited to 'libstdc++-v3/include/c')
| -rw-r--r-- | libstdc++-v3/include/c/bits/std_cwctype.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libstdc++-v3/include/c/bits/std_cwctype.h b/libstdc++-v3/include/c/bits/std_cwctype.h index 9a6a8914e70..e55b4c50ba0 100644 --- a/libstdc++-v3/include/c/bits/std_cwctype.h +++ b/libstdc++-v3/include/c/bits/std_cwctype.h @@ -39,12 +39,7 @@ #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 @@ -60,6 +55,11 @@ namespace std #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); |