PR libstdc++/68353 fix _GLIBCXX_USE_C99_WCHAR test

	PR libstdc++/68353
	* include/bits/basic_string.h: Test value of _GLIBCXX_USE_C99_WCHAR
	not whether it is defined.
	* include/ext/vstring.h: Likewise.

From-SVN: r230395

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 942e418b185f6933b1963069defb594f6713032a..fcef03553368af4064a7d2aa112867983b2370f6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-15  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/68353
+       * include/bits/basic_string.h: Test value of _GLIBCXX_USE_C99_WCHAR
+       not whether it is defined.
+       * include/ext/vstring.h: Likewise.
+
 2015-11-14  Andreas Tobler  <andreast@gcc.gnu.org>
 
        * acinclude.m4 (GLIBCXX_ENABLE_CLOCALE): Change locale implementation

diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index b3853cd58286a7f629ca453acd5e967fd6d0a5b4..e7f965ec2f9b2f5b08ceaa99224d42a3ce239d3e 100644 (file)
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -5503,7 +5503,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
   }
 #endif // _GLIBCXX_USE_C99_STDIO
 
-#if defined(_GLIBCXX_USE_WCHAR_T) && defined(_GLIBCXX_USE_C99_WCHAR)
+#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_C99_WCHAR
   inline int 
   stoi(const wstring& __str, size_t* __idx = 0, int __base = 10)
   { return __gnu_cxx::__stoa<long, int>(&std::wcstol, "stoi", __str.c_str(),

diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h
index 8732bd38891a7b74a0a0f4cf8d4f804c3db7a689..529e4f3324cc46e885930a167ea75a7ac15bc6c2 100644 (file)
--- a/libstdc++-v3/include/ext/vstring.h
+++ b/libstdc++-v3/include/ext/vstring.h
@@ -2794,7 +2794,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   }
 #endif // _GLIBCXX_USE_C99_STDIO
 
-#if defined(_GLIBCXX_USE_WCHAR_T) && defined(_GLIBCXX_USE_C99_WCHAR)
+#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_C99_WCHAR
   inline int 
   stoi(const __wvstring& __str, std::size_t* __idx = 0, int __base = 10)
   { return __gnu_cxx::__stoa<long, int>(&std::wcstol, "stoi", __str.c_str(),