Patchwork PATCH: [4.6 Regression] 22_locale/num_put/put/char/9780-2.cc

login
register
mail settings
Submitter H.J. Lu
Date Sept. 27, 2012, 8:33 p.m.
Message ID <20120927203304.GA9965@gmail.com>
Download mbox | patch
Permalink /patch/187478/
State New
Headers show

Comments

H.J. Lu - Sept. 27, 2012, 8:33 p.m.
Hi,

This patch backports revision 182385 from trunk to 4.6 branch.  Tested
on Linux/x86-64.  OK to install?

Thanks.


H.J.
--
Paolo Carlini - Sept. 27, 2012, 8:51 p.m.
On 09/27/2012 10:33 PM, H.J. Lu wrote:
> Hi,
>
> This patch backports revision 182385 from trunk to 4.6 branch.  Tested
> on Linux/x86-64.  OK to install?
Ok, thanks. But we are in 2012: let's simply have 2004-2012 as Copyright 
years.

Paolo.
H.J. Lu - Sept. 27, 2012, 9:01 p.m.
On Thu, Sep 27, 2012 at 1:51 PM, Paolo Carlini <paolo.carlini@oracle.com> wrote:
> On 09/27/2012 10:33 PM, H.J. Lu wrote:
>>
>> Hi,
>>
>> This patch backports revision 182385 from trunk to 4.6 branch.  Tested
>> on Linux/x86-64.  OK to install?
>
> Ok, thanks. But we are in 2012: let's simply have 2004-2012 as Copyright
> years.

Done and checked in.

Patch

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index aa94768..ff4b13e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@ 
+2012-09-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Backport from mainline
+	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-07-22  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	PR libstdc++/53270
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 7993691..5cf0d04 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;
 }