diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2012-03-06 16:43:51 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2012-03-06 16:43:51 +0000 |
| commit | 8c533c1988a422d1be89e46788a8cce787fa1cb5 (patch) | |
| tree | 4cd1d32b09227b433eed1777af48e300d860873b | |
| parent | cf38adcec31776cb118f90bffbbc55f4924cfc16 (diff) | |
svn merge -r182384:182385 svn+ssh://gcc.gnu.org/svn/gcc/trunkredhat/gcc-4_6-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_6-branch@185003 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc | 55 |
2 files changed, 51 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ba9ec09d9d7..ee0c5338e7d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-12-15 Benjamin Kosnik <bkoz@redhat.com> + + * testsuite/22_locale/num_put/put/char/9780-2.cc: Add test for "C" + locale, add sanity checks in case of grouping. + 2012-03-01 Release Manager * GCC 4.6.3 released. diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc index 7993691e916..5cf0d048a1c 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc @@ -1,7 +1,7 @@ // { dg-require-namedlocale "de_DE" } // { dg-require-namedlocale "es_ES" } -// Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2009, 2011 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -22,23 +22,60 @@ #include <locale> #include <testsuite_hooks.h> -int main() +// Make sure that formatted output uses the locale in the output stream. +using namespace std; +locale l1 = locale("de_DE"); +const num_put<char>& np = use_facet<num_put<char> >(l1); +const numpunct<char>& npunct = use_facet<numpunct<char> >(l1); + +void test01() { - using namespace std; + bool test __attribute__((unused)) = true; + + locale l2 = locale("C"); + const numpunct<char>& npunct2 = use_facet<numpunct<char> >(l2); + char c = npunct2.thousands_sep(); + string s = npunct2.grouping(); + + ostringstream oss; + oss.imbue(l2); + + long l = 1234567890; + np.put(oss.rdbuf(), oss, ' ', l); + string res = oss.str(); + + VERIFY( res == "1234567890" ); +} +void test02() +{ bool test __attribute__((unused)) = true; - locale l1 = locale("de_DE"); + locale l2 = locale("es_ES"); - - const num_put<char>& np = use_facet<num_put<char> >(l1); + const numpunct<char>& npunct3 = use_facet<numpunct<char> >(l2); + char c = npunct3.thousands_sep(); + string s = npunct3.grouping(); + ostringstream oss; oss.imbue(l2); long l = 1234567890; - np.put(oss.rdbuf(), oss, ' ', l); // 1234567890 + np.put(oss.rdbuf(), oss, ' ', l); string res = oss.str(); - - VERIFY( res == "1234567890" ); + if (!s.empty()) + VERIFY( res == "1.234.567.890" ); + else + VERIFY( res == "1234567890" ); +} + +int main() +{ + // Sanity check. + char c = npunct.thousands_sep(); + string s = npunct.grouping(); + + test01(); + test02(); return 0; } |