Index: typeck.c =================================================================== --- typeck.c (revision 110412) +++ typeck.c (working copy) @@ -1500,7 +1500,7 @@ string_conv_p (tree totype, tree exp, in /* This warning is not very useful, as it complains about printf. */ if (warn && warn_write_strings) - warning (0, "deprecated conversion from string constant to %qT'", totype); + warning (OPT_Wwrite_strings, "deprecated conversion from string constant to %qT'", totype); return 1; } @@ -2306,7 +2306,7 @@ build_array_ref (tree array, tree idx) while (TREE_CODE (foo) == COMPONENT_REF) foo = TREE_OPERAND (foo, 0); if (TREE_CODE (foo) == VAR_DECL && DECL_REGISTER (foo)) - warning (0, "subscripting array declared %"); + warning (OPT_Wextra, "subscripting array declared %"); } type = TREE_TYPE (TREE_TYPE (array)); @@ -4440,7 +4440,7 @@ cxx_mark_addressable (tree exp) } else if (extra_warnings) warning - (0, "address requested for %qD, which is declared %", x); + (OPT_Wextra, "address requested for %qD, which is declared %", x); } TREE_ADDRESSABLE (x) = 1; return true; @@ -6378,7 +6378,7 @@ check_return_expr (tree retval, bool *no } if (warn) - warning (0, "% should return a reference to %<*this%>"); + warning (OPT_Weffc__, "% should return a reference to %<*this%>"); } /* The fabled Named Return Value optimization, as per [class.copy]/15: Index: init.c =================================================================== --- init.c (revision 110412) +++ init.c (working copy) @@ -324,7 +324,7 @@ perform_member_init (tree member, tree i /* Effective C++ rule 12 requires that all data members be initialized. */ if (warn_ecpp && !explicit && TREE_CODE (type) != ARRAY_TYPE) - warning (0, "%J%qD should be initialized in the member initialization " + warning (OPT_Weffc__, "%J%qD should be initialized in the member initialization " "list", current_function_decl, member); if (init == void_type_node) @@ -524,16 +524,16 @@ sort_mem_initializers (tree t, tree mem_ if (warn_reorder && !subobject_init) { if (TREE_CODE (TREE_PURPOSE (next_subobject)) == FIELD_DECL) - warning (0, "%q+D will be initialized after", + warning (OPT_Wreorder, "%q+D will be initialized after", TREE_PURPOSE (next_subobject)); else - warning (0, "base %qT will be initialized after", + warning (OPT_Wreorder, "base %qT will be initialized after", TREE_PURPOSE (next_subobject)); if (TREE_CODE (subobject) == FIELD_DECL) - warning (0, " %q+#D", subobject); + warning (OPT_Wreorder, " %q+#D", subobject); else - warning (0, " base %qT", subobject); - warning (0, "%J when initialized here", current_function_decl); + warning (OPT_Wreorder, " base %qT", subobject); + warning (OPT_Wreorder, "%J when initialized here", current_function_decl); } /* Look again, from the beginning of the list. */ @@ -681,7 +681,7 @@ emit_mem_initializers (tree mem_inits) if (extra_warnings && !arguments && DECL_COPY_CONSTRUCTOR_P (current_function_decl) && TYPE_NEEDS_CONSTRUCTING (BINFO_TYPE (subobject))) - warning (0, "%Jbase class %q#T should be explicitly initialized in the " + warning (OPT_Wextra, "%Jbase class %q#T should be explicitly initialized in the " "copy constructor", current_function_decl, BINFO_TYPE (subobject)); Index: class.c =================================================================== --- class.c (revision 110412) +++ class.c (working copy) @@ -2937,7 +2937,7 @@ check_field_decls (tree t, tree *access_ if (! TYPE_HAS_CONSTRUCTOR (t) && CLASSTYPE_NON_AGGREGATE (t) && extra_warnings) - warning (0, "non-static reference %q+#D in class without a constructor", x); + warning (OPT_Wextra, "non-static reference %q+#D in class without a constructor", x); } type = strip_array_types (type); @@ -2984,7 +2984,7 @@ check_field_decls (tree t, tree *access_ if (! TYPE_HAS_CONSTRUCTOR (t) && CLASSTYPE_NON_AGGREGATE (t) && extra_warnings) - warning (0, "non-static const member %q+#D in class without a constructor", x); + warning (OPT_Wextra, "non-static const member %q+#D in class without a constructor", x); } /* A field that is pseudo-const makes the structure likewise. */ else if (CLASS_TYPE_P (type)) @@ -3032,7 +3032,7 @@ check_field_decls (tree t, tree *access_ && TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t) && !(TYPE_HAS_INIT_REF (t) && TYPE_HAS_ASSIGN_REF (t))) { - warning (0, "%q#T has pointer data members", t); + warning (OPT_Weffc__, "%q#T has pointer data members", t); if (! TYPE_HAS_INIT_REF (t)) { @@ -4469,7 +4469,7 @@ warn_about_ambiguous_bases (tree t) basetype = BINFO_TYPE (binfo); if (!lookup_base (t, basetype, ba_unique | ba_quiet, NULL)) - warning (0, "virtual base %qT inaccessible in %qT due to ambiguity", + warning (OPT_Wextra, "virtual base %qT inaccessible in %qT due to ambiguity", basetype, t); } } Index: decl.c =================================================================== --- decl.c (revision 110412) +++ decl.c (working copy) @@ -362,7 +362,7 @@ pop_label (tree label, tree old_value) define_label (location, DECL_NAME (label)); } else if (warn_unused_label && !TREE_USED (label)) - warning (0, "label %q+D defined but not used", label); + warning (OPT_Wunused_label, "label %q+D defined but not used", label); } SET_IDENTIFIER_LABEL_VALUE (DECL_NAME (label), old_value); @@ -556,7 +556,7 @@ poplevel (int keep, int reverse, int fun && ! TREE_USED (decl) && ! DECL_IN_SYSTEM_HEADER (decl) && DECL_NAME (decl) && ! DECL_ARTIFICIAL (decl)) - warning (0, "unused variable %q+D", decl); + warning (OPT_Wunused_variable, "unused variable %q+D", decl); /* Remove declarations for all the DECLs in this level. */ for (link = decls; link; link = TREE_CHAIN (link)) @@ -1120,7 +1120,7 @@ duplicate_decls (tree newdecl, tree oldd if (! TREE_PUBLIC (newdecl)) { if (warn_shadow) - warning (0, "shadowing %s function %q#D", + warning (OPT_Wshadow, "shadowing %s function %q#D", DECL_BUILT_IN (olddecl) ? "built-in" : "library", olddecl); /* Discard the old built-in function. */ @@ -1193,7 +1193,7 @@ duplicate_decls (tree newdecl, tree oldd olddecl); } else if (warn_shadow) - warning (0, "shadowing %s function %q#D", + warning (OPT_Wshadow, "shadowing %s function %q#D", DECL_BUILT_IN (olddecl) ? "built-in" : "library", olddecl); } @@ -1504,8 +1504,8 @@ duplicate_decls (tree newdecl, tree oldd /* Don't warn about friends, let add_friend take care of it. */ && ! (newdecl_is_friend || DECL_FRIEND_P (olddecl))) { - warning (0, "redundant redeclaration of %qD in same scope", newdecl); - warning (0, "previous declaration of %q+D", olddecl); + warning (OPT_Wredundant_decls, "redundant redeclaration of %qD in same scope", newdecl); + warning (OPT_Wredundant_decls, "previous declaration of %q+D", olddecl); } } @@ -9012,7 +9012,7 @@ grok_op_properties (tree decl, bool comp } if (what) - warning (0, "conversion to %s%s will never use a type " + warning (OPT_Wconversion, "conversion to %s%s will never use a type " "conversion operator", ref ? "a reference to " : "", what); } @@ -9103,13 +9103,13 @@ grok_op_properties (tree decl, bool comp if (TREE_CODE (ret) != REFERENCE_TYPE || !same_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (ret)), arg)) - warning (0, "prefix %qD should return %qT", decl, + warning (OPT_Weffc__, "prefix %qD should return %qT", decl, build_reference_type (arg)); } else { if (!same_type_p (TYPE_MAIN_VARIANT (ret), arg)) - warning (0, "postfix %qD should return %qT", decl, arg); + warning (OPT_Weffc__, "postfix %qD should return %qT", decl, arg); } } } @@ -9138,7 +9138,7 @@ grok_op_properties (tree decl, bool comp && (operator_code == TRUTH_ANDIF_EXPR || operator_code == TRUTH_ORIF_EXPR || operator_code == COMPOUND_EXPR)) - warning (0, "user-defined %qD always evaluates both arguments", + warning (OPT_Weffc__, "user-defined %qD always evaluates both arguments", decl); } @@ -9152,7 +9152,7 @@ grok_op_properties (tree decl, bool comp || operator_code == MULT_EXPR || operator_code == TRUNC_MOD_EXPR) && TREE_CODE (TREE_TYPE (TREE_TYPE (decl))) == REFERENCE_TYPE) - warning (0, "%qD should return by value", decl); + warning (OPT_Weffc__, "%qD should return by value", decl); /* [over.oper]/8 */ for (; argtypes && argtypes != void_list_node; @@ -10183,7 +10183,7 @@ start_preparsed_function (tree decl1, tr if (warn_ecpp && DECL_OVERLOADED_OPERATOR_P (decl1) == NOP_EXPR && TREE_CODE (TREE_TYPE (fntype)) == VOID_TYPE) - warning (0, "% should return a reference to %<*this%>"); + warning (OPT_Weffc__, "% should return a reference to %<*this%>"); /* Make the init_value nonzero so pushdecl knows this is not tentative. error_mark_node is replaced below (in poplevel) with the BLOCK. */ @@ -10940,7 +10940,7 @@ finish_function (int flags) /* Structor return values (if any) are set by the compiler. */ && !DECL_CONSTRUCTOR_P (fndecl) && !DECL_DESTRUCTOR_P (fndecl)) - warning (0, "no return statement in function returning non-void"); + warning (OPT_Wreturn_type, "no return statement in function returning non-void"); /* Store the end of the function, so that we get good line number info for the epilogue. */ Index: method.c =================================================================== --- method.c (revision 110412) +++ method.c (working copy) @@ -1135,7 +1135,7 @@ lazily_declare_fn (special_function_kind TYPE_METHODS list, which cause the destructor to be emitted in an incorrect location in the vtable. */ if (warn_abi && DECL_VIRTUAL_P (fn)) - warning (0, "vtable layout for class %qT may not be ABI-compliant" + warning (OPT_Wabi, "vtable layout for class %qT may not be ABI-compliant" "and may change in a future version of GCC due to " "implicit virtual destructor", type); Index: cvt.c =================================================================== --- cvt.c (revision 110412) +++ cvt.c (working copy) @@ -918,7 +918,7 @@ convert_to_void (tree expr, const char * /* The middle end does not warn about expressions that have been explicitly cast to void, so we must do so here. */ if (!TREE_SIDE_EFFECTS (expr)) - warning (0, "%s has no effect", implicit); + warning (OPT_Wunused_value, "%s has no effect", implicit); else { tree e; @@ -950,7 +950,7 @@ convert_to_void (tree expr, const char * || code == PREINCREMENT_EXPR || code == POSTDECREMENT_EXPR || code == POSTINCREMENT_EXPR))) - warning (0, "value computed is not used"); + warning (OPT_Wunused_value, "value computed is not used"); } } expr = build1 (CONVERT_EXPR, void_type_node, expr); Index: mangle.c =================================================================== --- mangle.c (revision 110412) +++ mangle.c (working copy) @@ -2526,7 +2526,7 @@ static inline const char * finish_mangling (const bool warn) { if (warn_abi && warn && G.need_abi_warning) - warning (0, "the mangled name of %qD will change in a future " + warning (OPT_Wabi, "the mangled name of %qD will change in a future " "version of GCC", G.entity); Index: cp-gimplify.c =================================================================== --- cp-gimplify.c (revision 110412) +++ cp-gimplify.c (working copy) @@ -361,7 +361,7 @@ gimplify_expr_stmt (tree *stmt_p) if (!IS_EMPTY_STMT (stmt) && !VOID_TYPE_P (TREE_TYPE (stmt)) && !TREE_NO_WARNING (stmt)) - warning (0, "statement with no effect"); + warning (OPT_Wextra, "statement with no effect"); } else if (warn_unused_value) warn_if_unused_value (stmt, input_location); Index: name-lookup.c =================================================================== --- name-lookup.c (revision 110412) +++ name-lookup.c (working copy) @@ -950,8 +950,8 @@ pushdecl_maybe_friend (tree x, bool is_f if (warn_shadow && !err) { - warning (0, "declaration of %q#D shadows a parameter", x); - warning (0, "%Jshadowed declaration is here", oldlocal); + warning (OPT_Wshadow, "declaration of %q#D shadows a parameter", x); + warning (OPT_Wshadow, "%Jshadowed declaration is here", oldlocal); } } @@ -975,22 +975,22 @@ pushdecl_maybe_friend (tree x, bool is_f if (member && !TREE_STATIC (member)) { /* Location of previous decl is not useful in this case. */ - warning (0, "declaration of %qD shadows a member of 'this'", + warning (OPT_Wshadow, "declaration of %qD shadows a member of 'this'", x); } else if (oldlocal != NULL_TREE && TREE_CODE (oldlocal) == VAR_DECL) { - warning (0, "declaration of %qD shadows a previous local", x); - warning (0, "%Jshadowed declaration is here", oldlocal); + warning (OPT_Wshadow, "declaration of %qD shadows a previous local", x); + warning (OPT_Wshadow, "%Jshadowed declaration is here", oldlocal); } else if (oldglobal != NULL_TREE && TREE_CODE (oldglobal) == VAR_DECL) /* XXX shadow warnings in outer-more namespaces */ { - warning (0, "declaration of %qD shadows a global declaration", + warning (OPT_Wshadow, "declaration of %qD shadows a global declaration", x); - warning (0, "%Jshadowed declaration is here", oldglobal); + warning (OPT_Wshadow, "%Jshadowed declaration is here", oldglobal); } } } Index: parser.c =================================================================== --- parser.c (revision 110412) +++ parser.c (working copy) @@ -1850,7 +1850,7 @@ static inline void cp_parser_warn_min_max (void) { if (warn_deprecated && !in_system_header) - warning (0, "minimum/maximum operators are deprecated"); + warning (OPT_Wdeprecated, "minimum/maximum operators are deprecated"); } /* If not parsing tentatively, issue a diagnostic of the form @@ -5416,7 +5416,7 @@ cp_parser_cast_expression (cp_parser *pa && !in_system_header && !VOID_TYPE_P (type) && current_lang_name != lang_name_c) - warning (0, "use of old-style cast"); + warning (OPT_Wold_style_cast, "use of old-style cast"); /* Only type conversions to integral or enumeration types can be used in constant-expressions. */