Commit f2871ffd by Paolo Carlini Committed by Paolo Carlini

re PR libstdc++/45300 (in cstdio/cstdlib keyword restrict is used instead of __restrict)

2010-08-16  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/45300
	* include/c_std/cstdlib: Replace 'restrict' -> '__restrict'.
	* include/c_std/cstdio: Likewise.
	* include/c_global/cstdlib: Likewise.
	* include/c_global/cstdio: Likewise.

From-SVN: r163283
parent 7bf7b578
2010-08-16 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/45300
* include/c_std/cstdlib: Replace 'restrict' -> '__restrict'.
* include/c_std/cstdio: Likewise.
* include/c_global/cstdlib: Likewise.
* include/c_global/cstdio: Likewise.
2010-08-16 Chris Moller <cmoller@redhat.com> 2010-08-16 Chris Moller <cmoller@redhat.com>
http://sourceware.org/bugzilla/show_bug.cgi?id=11874 http://sourceware.org/bugzilla/show_bug.cgi?id=11874
......
...@@ -150,15 +150,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) ...@@ -150,15 +150,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
extern "C" int extern "C" int
(snprintf)(char * restrict, std::size_t, const char * restrict, ...) throw (); (snprintf)(char * __restrict, std::size_t, const char * __restrict, ...)
throw ();
extern "C" int extern "C" int
(vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list); (vfscanf)(FILE * __restrict, const char * __restrict, __gnuc_va_list);
extern "C" int (vscanf)(const char * restrict, __gnuc_va_list); extern "C" int (vscanf)(const char * __restrict, __gnuc_va_list);
extern "C" int extern "C" int
(vsnprintf)(char * restrict, std::size_t, const char * restrict, (vsnprintf)(char * __restrict, std::size_t, const char * __restrict,
__gnuc_va_list) throw (); __gnuc_va_list) throw ();
extern "C" int extern "C" int
(vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list) (vsscanf)(const char * __restrict, const char * __restrict, __gnuc_va_list)
throw (); throw ();
#endif #endif
......
...@@ -181,9 +181,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) ...@@ -181,9 +181,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC #if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
extern "C" long long int (atoll)(const char *) throw (); extern "C" long long int (atoll)(const char *) throw ();
extern "C" long long int extern "C" long long int
(strtoll)(const char * restrict, char ** restrict, int) throw (); (strtoll)(const char * __restrict, char ** __restrict, int) throw ();
extern "C" unsigned long long int extern "C" unsigned long long int
(strtoull)(const char * restrict, char ** restrict, int) throw (); (strtoull)(const char * __restrict, char ** __restrict, int) throw ();
#endif #endif
#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
using ::atoll; using ::atoll;
......
...@@ -149,15 +149,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) ...@@ -149,15 +149,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
extern "C" int extern "C" int
(snprintf)(char * restrict, std::size_t, const char * restrict, ...) throw (); (snprintf)(char * __restrict, std::size_t, const char * __restrict, ...)
throw ();
extern "C" int extern "C" int
(vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list); (vfscanf)(FILE * __restrict, const char * __restrict, __gnuc_va_list);
extern "C" int (vscanf)(const char * restrict, __gnuc_va_list); extern "C" int (vscanf)(const char * __restrict, __gnuc_va_list);
extern "C" int extern "C" int
(vsnprintf)(char * restrict, std::size_t, const char * restrict, (vsnprintf)(char * __restrict, std::size_t, const char * __restrict,
__gnuc_va_list) throw (); __gnuc_va_list) throw ();
extern "C" int extern "C" int
(vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list) (vsscanf)(const char * __restrict, const char * __restrict, __gnuc_va_list)
throw (); throw ();
#endif #endif
......
...@@ -180,9 +180,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) ...@@ -180,9 +180,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC #if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
extern "C" long long int (atoll)(const char *) throw (); extern "C" long long int (atoll)(const char *) throw ();
extern "C" long long int extern "C" long long int
(strtoll)(const char * restrict, char ** restrict, int) throw (); (strtoll)(const char * __restrict, char ** __restrict, int) throw ();
extern "C" unsigned long long int extern "C" unsigned long long int
(strtoull)(const char * restrict, char ** restrict, int) throw (); (strtoull)(const char * __restrict, char ** __restrict, int) throw ();
#endif #endif
#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
using ::atoll; using ::atoll;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment