* g++.dg/cpp0x/nullptr20.C: Use sprintf.

From-SVN: r159153

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index acc40baeba6440c9e3dc89daa664d5a3dddf47d9..4c42faac88eaa612255e3f846ff1af9905bf960d 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-07  Jason Merrill  <jason@redhat.com>
+
+       * trans-expr.c (gfc_conv_procedure_call): Rename nullptr to null_ptr
+       to avoid -Wc++-compat warning.
+
 2010-05-06  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
        PR 40989

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 09a98b3699cd01b39030f317257ff2f352518075..2ddbe951209b4eafd76b9c4ef0389d0a2db65222 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-07  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/cpp0x/nullptr20.C: Use sprintf.
+
 2010-05-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * gcc.dg/lto/20100423-2_0.c: Include <stdio.h>.

diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr20.C b/gcc/testsuite/g++.dg/cpp0x/nullptr20.C
index b7457ca124a911ead02bf4b340c4794c8a4e64f6..a959b00786f3af60c21914e4ef9c6d48b0d3648c 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/nullptr20.C
+++ b/gcc/testsuite/g++.dg/cpp0x/nullptr20.C
@@ -11,7 +11,7 @@ int main()
   char buf1[64];
   char buf2[64];
 
-  std::snprintf(buf1, sizeof(buf1), "%p", (void*)0);
-  std::snprintf(buf2, sizeof(buf2), "%p", nullptr);
+  std::sprintf(buf1, "%p", (void*)0);
+  std::sprintf(buf2, "%p", nullptr);
   return std::strcmp(buf1, buf2) != 0;
 }