diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nullptr20.C | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index acc40ba..4c42faa 100644 --- 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 09a98b3..2ddbe95 100644 --- 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 b7457ca..a959b00 100644 --- 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; } |