Author: faridz
Date: Mon Sep 8 09:40:23 2008
New Revision: 693155
URL: http://svn.apache.org/viewvc?rev=693155&view=rev
Log:
2008-09-08 Farid Zaripov <[EMAIL PROTECTED]>
Merged revs 674231 and 674025 from 4.2.x.
2008-07-05 Martin Sebor <[EMAIL PROTECTED]>
* tests/self/0.printf.cpp (<wchar.h>): Included C header instead
of the C++ one (<cwchar>) for consistency with the test driver
and its test suite.
2008-07-04 Farid Zaripov <[EMAIL PROTECTED]>
* tests/self/0.printf.cpp: #included <cwchar> header for WEOF.
(test_character): Use WEOF instead -1 in testing of the %{lc} format.
Modified:
stdcxx/trunk/tests/self/0.printf.cpp
Modified: stdcxx/trunk/tests/self/0.printf.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/self/0.printf.cpp?rev=693155&r1=693154&r2=693155&view=diff
==============================================================================
--- stdcxx/trunk/tests/self/0.printf.cpp (original)
+++ stdcxx/trunk/tests/self/0.printf.cpp Mon Sep 8 09:40:23 2008
@@ -44,13 +44,14 @@
#include <ctype.h> // for isdigit()
#include <errno.h> // for EXXX, errno
#include <limits.h> // for INT_MAX, ...
+#include <locale.h> // for LC_ALL, ...
#include <signal.h> // for SIGABRT, ...
#include <stdio.h> // for printf(), ...
#include <stdlib.h> // for free(), size_t
#include <string.h> // for strcpy()
#include <stdarg.h> // for va_arg, ...
#include <time.h> // for struct tm
-#include <locale.h> // for LC_ALL, ...
+#include <wchar.h> // for WEOF
// disable tests for function name in "%{lF}"
@@ -342,7 +343,7 @@
TEST ("%{lc}", L'A', 0, 0, "A");
TEST ("%{lc}", L'Z', 0, 0, "Z");
TEST ("%{lc}", L'\xff', 0, 0, "\\xff");
- TEST ("%{lc}", -1, 0, 0, "EOF");
+ TEST ("%{lc}", WEOF, 0, 0, "EOF");
//////////////////////////////////////////////////////////////////
printf ("%s\n", "extension: \"%{#lc}\": quoted escaped wide character");
@@ -358,7 +359,7 @@
TEST ("%{#lc}", L'A', 0, 0, "'A'");
TEST ("%{#lc}", L'Z', 0, 0, "'Z'");
TEST ("%{#lc}", L'\xff', 0, 0, "'\\xff'");
- TEST ("%{#lc}", -1, 0, 0, "EOF");
+ TEST ("%{#lc}", WEOF, 0, 0, "EOF");
}
/***********************************************************************/
