diff options
| author | Benjamin Kosnik <bkoz@purist.soma.redhat.com> | 2000-11-24 23:48:45 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-11-24 23:48:45 +0000 |
| commit | 35a63b9486cbf0087693eef306b10a528177aa7a (patch) | |
| tree | 88777d03fb87bc97cbf3a9e095dffab96c11529d /libstdc++-v3 | |
| parent | c3ff75c42196cf0da280614e44b05be073e530c3 (diff) | |
| download | gcc-35a63b9486cbf0087693eef306b10a528177aa7a.zip gcc-35a63b9486cbf0087693eef306b10a528177aa7a.tar.gz gcc-35a63b9486cbf0087693eef306b10a528177aa7a.tar.bz2 | |
codecvt_wchar_t_char.cc (main): Add _GLIBCPP_USE_WCHAR_T guards.
2000-11-24 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* testsuite/22_locale/codecvt_wchar_t_char.cc (main): Add
_GLIBCPP_USE_WCHAR_T guards.
* configure.in (AC_OUTPUT_COMMANDS): Remove, just run scripts as
is, so that checks for existence of generated files actually work.
* configure: Regenerate.
From-SVN: r37723
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 8 | ||||
| -rw-r--r-- | libstdc++-v3/configure.in | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc | 5 |
4 files changed, 24 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0f6c3fd..6a1ecb6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2000-11-24 Benjamin Kosnik <bkoz@purist.soma.redhat.com> + + * testsuite/22_locale/codecvt_wchar_t_char.cc (main): Add + _GLIBCPP_USE_WCHAR_T guards. + + * configure.in (AC_OUTPUT_COMMANDS): Remove, just run scripts as + is, so that checks for existence of generated files actually work. + * configure: Regenerate. + 2000-11-23 Hans-Peter Nilsson <hp@bitrange.com> * config/os/gnu-linux/bits/os_defines.h: Include <features.h>. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index d026a24..0f4dc49 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -19337,11 +19337,11 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 # Generate bits/c++config.h # NB: This must be the first generated file as others include it. . . - +$srcdir/mkc++config $blddir $srcdir # Generate bits/std_limits.h and src/limitsMEMBERS.cc if test ! -f stamp-limits; then - + $srcdir/mknumeric_limits $blddir $srcdir $xcompiling touch stamp-limits fi @@ -19370,7 +19370,7 @@ if test ! -f stamp-sanity-warned; then fi -$srcdir/mkc++config $blddir $srcdir -$srcdir/mknumeric_limits $blddir $srcdir $xcompiling + + diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in index 4cba0f6..8c6d232 100644 --- a/libstdc++-v3/configure.in +++ b/libstdc++-v3/configure.in @@ -247,11 +247,11 @@ CXX="${CXX}" # Generate bits/c++config.h # NB: This must be the first generated file as others include it. . . -AC_OUTPUT_COMMANDS([$srcdir/mkc++config $blddir $srcdir]) +$srcdir/mkc++config $blddir $srcdir # Generate bits/std_limits.h and src/limitsMEMBERS.cc if test ! -f stamp-limits; then - AC_OUTPUT_COMMANDS([$srcdir/mknumeric_limits $blddir $srcdir $xcompiling]) + $srcdir/mknumeric_limits $blddir $srcdir $xcompiling touch stamp-limits fi @@ -280,3 +280,7 @@ if test ! -f stamp-sanity-warned; then fi + + + + diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc index 91505be..3f7c83b 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc @@ -34,6 +34,7 @@ // or, can use this explicit "C" initialization: // w_codecvt::state_type state01 = {0, 0}; // .. except Ulrich says: Use memset. Always use memset. Feel the force... +#ifdef _GLIBCPP_USE_WCHAR_T void zero_state(std::mbstate_t& state) { std::memset(&state, 0, sizeof(std::mbstate_t)); } @@ -109,10 +110,14 @@ void test01() delete [] e_arr; delete [] i_arr; } +#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */ + int main () { +#if _GLIBCPP_USE_WCHAR_T test01(); +#endif return 0; } |