| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Mon, 11 Mar 2013 10:38:09 -0700 | |
| branch | s11-update |
| changeset 2520 | ceec631e74d1 |
| parent 402 | 94ae4d75524c |
| permissions | -rw-r--r-- |
|
402
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
--- stdcxx-4.2.1/tests/localization/22.locale.numpunct.cpp 2008-04-24 17:23:10.000000000 -0700 |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
+++ stdcxx-4.2.1/tests/localization/22.locale.numpunct.cpp 2009-07-27 14:41:33.627970295 -0700 |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -137,7 +137,7 @@ |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
// verify that numpunct behaves correctly when LC_ALL is set |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
// to the name of the (non-C, non-POSIX) locale |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
char envvar [80]; |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
- std::sprintf (envvar, "LC_ALL=%s", first_non_c); |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
+ std::sprintf (envvar, "LC_ALL=%s", first_non_c ? first_non_c : ""); |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
rw_putenv (envvar); |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
check_numpunct (charT (), tname, "", loc); |
|
94ae4d75524c
7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
} |