diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-02 20:16:43 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-02 20:16:43 +0000 |
| commit | 7e783eb31289e9c506e33c1f9286387c0ff08425 (patch) | |
| tree | 883396e26db08ff838de9608ab092c69fcce8870 /gcc/c-family/c-opts.c | |
| parent | 86f32fa5f39d6c133b3ba59a35de648906c80971 (diff) | |
| download | ppe42-gcc-7e783eb31289e9c506e33c1f9286387c0ff08425.tar.gz ppe42-gcc-7e783eb31289e9c506e33c1f9286387c0ff08425.zip | |
PR c++/50810
gcc/c-family
* c-opts.c (c_common_handle_option): Enable -Wnarrowing as part
of -Wall; include -Wnarrowing in -Wc++0x-compat; adjust default
Wnarrowing for C++0x and C++98.
* c.opt ([Wnarrowing]): Update.
gcc/cp
* typeck2.c (check_narrowing): Adjust OPT_Wnarrowing diagnostics.
(digest_init_r): Call check_narrowing irrespective of the C++ dialect.
* decl.c (check_initializer): Likewise.
* semantics.c (finish_compound_literal): Likewise.
gcc/
* configure.ac: Add -Wno-narrowing to warning options.
libcpp/
* configure.ac: Add -Wno-narrowing to warning options.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180794 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family/c-opts.c')
| -rw-r--r-- | gcc/c-family/c-opts.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index b56aec79906..465bce35de3 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -406,6 +406,7 @@ c_common_handle_option (size_t scode, const char *arg, int value, warn_reorder = value; warn_cxx0x_compat = value; warn_delnonvdtor = value; + warn_narrowing = value; } cpp_opts->warn_trigraphs = value; @@ -436,6 +437,10 @@ c_common_handle_option (size_t scode, const char *arg, int value, cpp_opts->warn_cxx_operator_names = value; break; + case OPT_Wc__0x_compat: + warn_narrowing = value; + break; + case OPT_Wdeprecated: cpp_opts->cpp_warn_deprecated = value; break; @@ -997,10 +1002,17 @@ c_common_post_options (const char **pfilename) if (warn_implicit_function_declaration == -1) warn_implicit_function_declaration = flag_isoc99; - /* If we're allowing C++0x constructs, don't warn about C++0x - compatibility problems. */ if (cxx_dialect == cxx0x) - warn_cxx0x_compat = 0; + { + /* If we're allowing C++0x constructs, don't warn about C++98 + identifiers which are keywords in C++0x. */ + warn_cxx0x_compat = 0; + + if (warn_narrowing == -1) + warn_narrowing = 1; + } + else if (warn_narrowing == -1) + warn_narrowing = 0; if (flag_preprocess_only) { |
