OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

codecvt_wchar_t_char.cc (main): Add _GLIBCPP_USE_WCHAR_T guards.

Browse Source 
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
This commit is contained in:
Benjamin Kosnik 2000-11-24 23:48:45 +00:00 committed by Benjamin Kosnik
parent c3ff75c421
commit 35a63b9486
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -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> 2000-11-23 Hans-Peter Nilsson <hp@bitrange.com>
* config/os/gnu-linux/bits/os_defines.h: Include <features.h>. * config/os/gnu-linux/bits/os_defines.h: Include <features.h>.

8
libstdc++-v3/configure vendored
View File

@ -19337,11 +19337,11 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
# Generate bits/c++config.h # Generate bits/c++config.h
# NB: This must be the first generated file as others include it. . . # 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 # Generate bits/std_limits.h and src/limitsMEMBERS.cc
if test ! -f stamp-limits; then if test ! -f stamp-limits; then
$srcdir/mknumeric_limits $blddir $srcdir $xcompiling
touch stamp-limits touch stamp-limits
fi fi
@ -19370,7 +19370,7 @@ if test ! -f stamp-sanity-warned; then
fi fi
$srcdir/mkc++config $blddir $srcdir
$srcdir/mknumeric_limits $blddir $srcdir $xcompiling

8
libstdc++-v3/configure.in
View File

@ -247,11 +247,11 @@ CXX="${CXX}"
# Generate bits/c++config.h # Generate bits/c++config.h
# NB: This must be the first generated file as others include it. . . # 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 # Generate bits/std_limits.h and src/limitsMEMBERS.cc
if test ! -f stamp-limits; then if test ! -f stamp-limits; then
AC_OUTPUT_COMMANDS([$srcdir/mknumeric_limits $blddir $srcdir $xcompiling]) $srcdir/mknumeric_limits $blddir $srcdir $xcompiling
touch stamp-limits touch stamp-limits
fi fi
@ -280,3 +280,7 @@ if test ! -f stamp-sanity-warned; then
fi fi

5
libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc
View File

@ -34,6 +34,7 @@
// or, can use this explicit "C" initialization: // or, can use this explicit "C" initialization:
// w_codecvt::state_type state01 = {0, 0}; // w_codecvt::state_type state01 = {0, 0};
// .. except Ulrich says: Use memset. Always use memset. Feel the force... // .. except Ulrich says: Use memset. Always use memset. Feel the force...
#ifdef _GLIBCPP_USE_WCHAR_T
void void
zero_state(std::mbstate_t& state) zero_state(std::mbstate_t& state)
{ std::memset(&state, 0, sizeof(std::mbstate_t)); } { std::memset(&state, 0, sizeof(std::mbstate_t)); }
@ -109,10 +110,14 @@ void test01()
delete [] e_arr; delete [] e_arr;
delete [] i_arr; delete [] i_arr;
} }
#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
int main () int main ()
{ {
#if _GLIBCPP_USE_WCHAR_T
test01(); test01();
#endif
return 0; return 0;
} }