This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] Fix libstdc++/38210


Hi,

tested x86_64-linux, committed to mainline.

Paolo.

////////////////////
2008-11-21  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/38210
	* include/bits/locale_facets.tcc (num_put<>::do_put(iter_type,
	ios_base&, char_type, const void*)): Fix.
	* testsuite/22_locale/num_put/put/char/38210.cc: New.
	* testsuite/22_locale/num_put/put/wchar_t/38210.cc: Likewise.
Index: include/bits/locale_facets.tcc
===================================================================
*** include/bits/locale_facets.tcc	(revision 142055)
--- include/bits/locale_facets.tcc	(working copy)
*************** _GLIBCXX_BEGIN_LDBL_NAMESPACE
*** 1151,1158 ****
      {
        const ios_base::fmtflags __flags = __io.flags();
        const ios_base::fmtflags __fmt = ~(ios_base::basefield
! 					 | ios_base::uppercase
! 					 | ios_base::internal);
        __io.flags((__flags & __fmt) | (ios_base::hex | ios_base::showbase));
  
        typedef __gnu_cxx::__conditional_type<(sizeof(const void*)
--- 1151,1157 ----
      {
        const ios_base::fmtflags __flags = __io.flags();
        const ios_base::fmtflags __fmt = ~(ios_base::basefield
! 					 | ios_base::uppercase);
        __io.flags((__flags & __fmt) | (ios_base::hex | ios_base::showbase));
  
        typedef __gnu_cxx::__conditional_type<(sizeof(const void*)
Index: testsuite/22_locale/num_put/put/wchar_t/38210.cc
===================================================================
*** testsuite/22_locale/num_put/put/wchar_t/38210.cc	(revision 0)
--- testsuite/22_locale/num_put/put/wchar_t/38210.cc	(revision 0)
***************
*** 0 ****
--- 1,73 ----
+ // Copyright (C) 2008 Free Software Foundation
+ //
+ // 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
+ // terms of the GNU General Public License as published by the
+ // Free Software Foundation; either version 2, or (at your option)
+ // any later version.
+ 
+ // This library is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ // GNU General Public License for more details.
+ 
+ // You should have received a copy of the GNU General Public License along
+ // with this library; see the file COPYING.  If not, write to the Free
+ // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ 
+ // 22.2.2.2.1  num_put members
+ 
+ #include <locale>
+ #include <sstream>
+ #include <testsuite_hooks.h>
+ 
+ // libstdc++/38210
+ void test01()
+ {
+   bool test __attribute__((unused)) = true;
+   using namespace std;
+ 
+   wostringstream oss1, oss2, oss3, oss4;
+   wstring result1, result2, result3, result4;
+ 
+   const num_put<wchar_t>& ng1 = use_facet<num_put<wchar_t> >(oss1.getloc());
+   const num_put<wchar_t>& ng2 = use_facet<num_put<wchar_t> >(oss2.getloc());
+   const num_put<wchar_t>& ng3 = use_facet<num_put<wchar_t> >(oss3.getloc());
+   const num_put<wchar_t>& ng4 = use_facet<num_put<wchar_t> >(oss4.getloc());
+ 
+   void* p = (void*)0x1;
+ 
+   oss1.width(5);
+   oss1.setf(ios_base::boolalpha);
+   ng1.put(oss1.rdbuf(), oss1, L'*', p);
+   result1 = oss1.str();
+   VERIFY( result1 == L"**0x1" );
+ 
+   oss2.width(5);
+   oss2.setf(ios_base::right, ios_base::adjustfield);
+   oss2.setf(ios_base::boolalpha);
+   ng2.put(oss2.rdbuf(), oss2, L'*', p);
+   result2 = oss2.str();
+   VERIFY( result2 == L"**0x1" );
+ 
+   oss3.width(5);
+   oss3.setf(ios_base::internal, ios_base::adjustfield);
+   oss3.setf(ios_base::boolalpha);
+   ng3.put(oss3.rdbuf(), oss3, L'*', p);
+   result3 = oss3.str();
+   VERIFY( result3 == L"0x**1" );
+ 
+   oss4.width(5);
+   oss4.setf(ios_base::left, ios_base::adjustfield);
+   oss4.setf(ios_base::boolalpha);
+   ng4.put(oss4.rdbuf(), oss4, L'*', p);
+   result4 = oss4.str();
+   VERIFY( result4 == L"0x1**" );
+ }
+ 
+ int main()
+ {
+   test01();
+   return 0;
+ }
Index: testsuite/22_locale/num_put/put/char/38210.cc
===================================================================
*** testsuite/22_locale/num_put/put/char/38210.cc	(revision 0)
--- testsuite/22_locale/num_put/put/char/38210.cc	(revision 0)
***************
*** 0 ****
--- 1,73 ----
+ // Copyright (C) 2008 Free Software Foundation
+ //
+ // 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
+ // terms of the GNU General Public License as published by the
+ // Free Software Foundation; either version 2, or (at your option)
+ // any later version.
+ 
+ // This library is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ // GNU General Public License for more details.
+ 
+ // You should have received a copy of the GNU General Public License along
+ // with this library; see the file COPYING.  If not, write to the Free
+ // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ 
+ // 22.2.2.2.1  num_put members
+ 
+ #include <locale>
+ #include <sstream>
+ #include <testsuite_hooks.h>
+ 
+ // libstdc++/38210
+ void test01()
+ {
+   bool test __attribute__((unused)) = true;
+   using namespace std;
+ 
+   ostringstream oss1, oss2, oss3, oss4;
+   string result1, result2, result3, result4;
+ 
+   const num_put<char>& ng1 = use_facet<num_put<char> >(oss1.getloc());
+   const num_put<char>& ng2 = use_facet<num_put<char> >(oss2.getloc());
+   const num_put<char>& ng3 = use_facet<num_put<char> >(oss3.getloc());
+   const num_put<char>& ng4 = use_facet<num_put<char> >(oss4.getloc());
+ 
+   void* p = (void*)0x1;
+ 
+   oss1.width(5);
+   oss1.setf(ios_base::boolalpha);
+   ng1.put(oss1.rdbuf(), oss1, '*', p);
+   result1 = oss1.str();
+   VERIFY( result1 == "**0x1" );
+ 
+   oss2.width(5);
+   oss2.setf(ios_base::right, ios_base::adjustfield);
+   oss2.setf(ios_base::boolalpha);
+   ng2.put(oss2.rdbuf(), oss2, '*', p);
+   result2 = oss2.str();
+   VERIFY( result2 == "**0x1" );
+ 
+   oss3.width(5);
+   oss3.setf(ios_base::internal, ios_base::adjustfield);
+   oss3.setf(ios_base::boolalpha);
+   ng3.put(oss3.rdbuf(), oss3, '*', p);
+   result3 = oss3.str();
+   VERIFY( result3 == "0x**1" );
+ 
+   oss4.width(5);
+   oss4.setf(ios_base::left, ios_base::adjustfield);
+   oss4.setf(ios_base::boolalpha);
+   ng4.put(oss4.rdbuf(), oss4, '*', p);
+   result4 = oss4.str();
+   VERIFY( result4 == "0x1**" );
+ }
+ 
+ int main()
+ {
+   test01();
+   return 0;
+ }

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]