2013-04-26 Paolo Carlini <paolo.carlini@oracle.com>

	* include/c_global/cstdio (gets): Provide only in C++98 and C++11.
	* include/c_std/cstdio (gets): Likewise.
	* testsuite/27_io/headers/cstdio/functions_std.cc: Adjust.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198335 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5846019..983ff96 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/c_global/cstdio (gets): Provide only in C++98 and C++11.
+       * include/c_std/cstdio (gets): Likewise.
+       * testsuite/27_io/headers/cstdio/functions_std.cc: Adjust.
+
 2013-04-25  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/57065

diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio
index fcbec0c..249a779 100644 (file)
--- a/libstdc++-v3/include/c_global/cstdio
+++ b/libstdc++-v3/include/c_global/cstdio
@@ -69,7 +69,9 @@ extern "C" char* gets (char* __s) __attribute__((deprecated));
 #undef ftell
 #undef fwrite
 #undef getc
-#undef gets
+#if __cplusplus <= 201103L
+# undef gets
+#endif
 #undef perror
 #undef printf
 #undef putc
@@ -116,7 +118,9 @@ namespace std
   using ::fwrite;
   using ::getc;
   using ::getchar;
+#if __cplusplus <= 201103L
   using ::gets;
+#endif
   using ::perror;
   using ::printf;
   using ::putc;

diff --git a/libstdc++-v3/include/c_std/cstdio b/libstdc++-v3/include/c_std/cstdio
index e85bd83..273383e 100644 (file)
--- a/libstdc++-v3/include/c_std/cstdio
+++ b/libstdc++-v3/include/c_std/cstdio
@@ -70,7 +70,9 @@ extern "C" char* gets (char* __s) __attribute__((deprecated));
 #undef fwrite
 #undef getc
 #undef getchar
-#undef gets
+#if __cplusplus <= 201103L
+# undef gets
+#endif
 #undef perror
 #undef printf
 #undef putc
@@ -117,7 +119,9 @@ namespace std
   using ::fwrite;
   using ::getc;
   using ::getchar;
+#if __cplusplus <= 201103L
   using ::gets;
+#endif
   using ::perror;
   using ::printf;
   using ::putc;

diff --git a/libstdc++-v3/testsuite/27_io/headers/cstdio/functions_std.cc b/libstdc++-v3/testsuite/27_io/headers/cstdio/functions_std.cc
index 19a80b7..c5d787f 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/headers/cstdio/functions_std.cc
+++ b/libstdc++-v3/testsuite/27_io/headers/cstdio/functions_std.cc
@@ -24,8 +24,10 @@ namespace gnu
   using std::clearerr; 
   using std::tmpfile; 
   using std::fgets; 
-  using std::fscanf; 
-  using std::gets; 
+  using std::fscanf;
+#if __cplusplus <= 201103L
+  using std::gets;
+#endif
   using std::rename;
   using std::fclose; 
   using std::fopen;