re PR libstdc++/37522 (Incorrect vswprintf prototype breaks __to_xstring)
PR libstdc++/37522 * include/bits/basic_string.h (stod, stof, stoi, stol, stold, stoll, stoul, stoull, to_string): Only use _GLIBCXX_HAVE_BROKEN_VSWPRINTF to guard definition of to_wstring. * testsuite/21_strings/basic_string/numeric_conversions/char/dr1261.cc: Do not use dg-require-string-conversions. * testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stold.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stoll.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/ stoull.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/ to_string.cc: Likewise. From-SVN: r219019
This commit is contained in:
Jonathan Wakely
Jonathan Wakely
parent
08d54510cc
commit
f37f5fb81c
12 changed files with 30 additions and 12 deletions
|
|
@ -1,3 +1,30 @@
|
|||
2014-12-22 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
PR libstdc++/37522
|
||||
* include/bits/basic_string.h (stod, stof, stoi, stol, stold, stoll,
|
||||
stoul, stoull, to_string): Only use _GLIBCXX_HAVE_BROKEN_VSWPRINTF
|
||||
to guard definition of to_wstring.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/dr1261.cc:
|
||||
Do not use dg-require-string-conversions.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc:
|
||||
Likewise.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc:
|
||||
Likewise.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc:
|
||||
Likewise.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc:
|
||||
Likewise.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/stold.cc:
|
||||
Likewise.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/stoll.cc:
|
||||
Likewise.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc:
|
||||
Likewise.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/
|
||||
stoull.cc: Likewise.
|
||||
* testsuite/21_strings/basic_string/numeric_conversions/char/
|
||||
to_string.cc: Likewise.
|
||||
|
||||
2014-12-22 Ville Voutilainen <ville.voutilainen@gmail.com>
|
||||
|
||||
PR libstdc++/60271
|
||||
|
|
|
|||
|
|
@ -5240,8 +5240,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
|
|||
_GLIBCXX_END_NAMESPACE_VERSION
|
||||
} // namespace
|
||||
|
||||
#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
|
||||
&& !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
|
||||
#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
|
||||
|
||||
#include <ext/string_conversions.h>
|
||||
|
||||
|
|
@ -5392,6 +5391,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
|
|||
stold(const wstring& __str, size_t* __idx = 0)
|
||||
{ return __gnu_cxx::__stoa(&std::wcstold, "stold", __str.c_str(), __idx); }
|
||||
|
||||
#ifndef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
|
||||
// DR 1261.
|
||||
inline wstring
|
||||
to_wstring(int __val)
|
||||
|
|
@ -5453,6 +5453,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
|
|||
return __gnu_cxx::__to_xstring<wstring>(&std::vswprintf, __n,
|
||||
L"%Lf", __val);
|
||||
}
|
||||
#endif // _GLIBCXX_HAVE_BROKEN_VSWPRINTF
|
||||
#endif
|
||||
|
||||
_GLIBCXX_END_NAMESPACE_CXX11
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2009-11-11 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-string-conversions "" }
|
||||
|
||||
// 2008-06-15 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue