From 1a7817e4e80c5f7f84d61e6885adb2cfdd1e32e7 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 2 Jan 2008 04:35:50 +0000 Subject: [PATCH] c-opts.c (sanitize_cpp_opts): Don't warn about "long long" when in C++0x mode. 2008-01-01 Douglas Gregor * c-opts.c (sanitize_cpp_opts): Don't warn about "long long" when in C++0x mode. 2008-01-01 Douglas Gregor * parser.c (cp_parser_check_decl_spec): Don't warn about "long long" in C++0x mode; change the warning to note that "long long" is only unsupported in C++98 mode. 2008-01-01 Douglas Gregor * g++.dg/cpp0x/long_long.C: New. From-SVN: r131254 --- gcc/ChangeLog | 5 +++++ gcc/c-opts.c | 6 +++++- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 5 +++-- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/cpp0x/long_long.C | 6 ++++++ 6 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/long_long.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ce2f258a9b1b..7fc21c4d6a86 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2008-01-01 Douglas Gregor + + * c-opts.c (sanitize_cpp_opts): Don't warn about "long long" when + in C++0x mode. + 2008-01-01 Volker Reichelt PR libmudflap/26442 diff --git a/gcc/c-opts.c b/gcc/c-opts.c index a5c2270c025a..3c6219265cd5 100644 --- a/gcc/c-opts.c +++ b/gcc/c-opts.c @@ -1429,7 +1429,11 @@ sanitize_cpp_opts (void) /* We want -Wno-long-long to override -pedantic -std=non-c99 and/or -Wtraditional, whatever the ordering. */ cpp_opts->warn_long_long - = warn_long_long && ((!flag_isoc99 && pedantic) || warn_traditional); + = warn_long_long && ((pedantic + && (c_dialect_cxx () + ? cxx_dialect == cxx98 + : !flag_isoc99)) + || warn_traditional); /* Similarly with -Wno-variadic-macros. No check for c99 here, since this also turns off warnings about GCCs extension. */ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a67b941bb224..cc99369d1861 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-01-01 Douglas Gregor + + * parser.c (cp_parser_check_decl_spec): Don't warn about "long + long" in C++0x mode; change the warning to note that "long long" + is only unsupported in C++98 mode. + 2007-12-20 Jason Merrill PR c++/34111 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index d59262001086..16f5a4e4c065 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -2147,8 +2147,9 @@ cp_parser_check_decl_spec (cp_decl_specifier_seq *decl_specs) { if (count > 2) error ("% is too long for GCC"); - else if (pedantic && !in_system_header && warn_long_long) - pedwarn ("ISO C++ does not support %"); + else if (pedantic && !in_system_header && warn_long_long + && cxx_dialect == cxx98) + pedwarn ("ISO C++ 1998 does not support %"); } else if (count > 1) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 76e5a14de926..f8ea8d2fc2ca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-01-01 Douglas Gregor + + * g++.dg/cpp0x/long_long.C: New. + 2008-01-01 Andrew Pinski * gcc.target/spu/tag_manager.c : Include stdlib.h. diff --git a/gcc/testsuite/g++.dg/cpp0x/long_long.C b/gcc/testsuite/g++.dg/cpp0x/long_long.C new file mode 100644 index 000000000000..3ef710df4838 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/long_long.C @@ -0,0 +1,6 @@ +// { dg-options "-std=c++0x -pedantic" } + +void foo() +{ + long long x = 17; +} -- 2.47.2