diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticGroups.td | 6 | ||||
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 4 | ||||
| -rw-r--r-- | lib/Sema/Sema.cpp | 2 | ||||
| -rw-r--r-- | test/SemaCXX/warn-unused-filescoped.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index 61928f03c8..3d8255e874 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -133,7 +133,7 @@ def UnknownAttributes : DiagGroup<"unknown-attributes">; def UnusedArgument : DiagGroup<"unused-argument">; def UnusedExceptionParameter : DiagGroup<"unused-exception-parameter">; def UnusedFunction : DiagGroup<"unused-function">; -def UnusedMethod : DiagGroup<"unused-method">; +def UnusedMemberFunction : DiagGroup<"unused-member-function">; def UnusedLabel : DiagGroup<"unused-label">; def UnusedParameter : DiagGroup<"unused-parameter">; def UnusedValue : DiagGroup<"unused-value">; @@ -168,7 +168,7 @@ def Conversion : DiagGroup<"conversion", def Unused : DiagGroup<"unused", [UnusedArgument, UnusedFunction, UnusedLabel, // UnusedParameter, (matches GCC's behavior) - // UnusedMethod, (clean-up llvm before enabling) + // UnusedMemberFunction, (clean-up llvm before enabling) UnusedValue, UnusedVariable]>, DiagCategory<"Unused Entity Issue">; @@ -187,7 +187,7 @@ def Extra : DiagGroup<"extra", [ InitializerOverrides, SemiBeforeMethodBody, SignCompare, - UnusedMethod, + UnusedMemberFunction, UnusedParameter ]>; diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 6f525ca16c..f20c199246 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -104,8 +104,8 @@ def warn_decl_in_param_list : Warning< "declaration of %0 will not be visible outside of this function">; def warn_unused_function : Warning<"unused function %0">, InGroup<UnusedFunction>, DefaultIgnore; -def warn_unused_method : Warning<"unused method %0">, - InGroup<UnusedMethod>, DefaultIgnore; +def warn_unused_member_function : Warning<"unused member function %0">, + InGroup<UnusedMemberFunction>, DefaultIgnore; def warn_implicit_function_decl : Warning< "implicit declaration of function %0">, diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp index 92e3fdd72a..03feed0e54 100644 --- a/lib/Sema/Sema.cpp +++ b/lib/Sema/Sema.cpp @@ -377,7 +377,7 @@ void Sema::ActOnEndOfTranslationUnit() { if (!FD->hasBody(DiagD)) DiagD = FD; Diag(DiagD->getLocation(), - isa<CXXMethodDecl>(DiagD) ? diag::warn_unused_method + isa<CXXMethodDecl>(DiagD) ? diag::warn_unused_member_function : diag::warn_unused_function) << DiagD->getDeclName(); } else { diff --git a/test/SemaCXX/warn-unused-filescoped.cpp b/test/SemaCXX/warn-unused-filescoped.cpp index 37acecb0f3..75fc6a4da0 100644 --- a/test/SemaCXX/warn-unused-filescoped.cpp +++ b/test/SemaCXX/warn-unused-filescoped.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -verify -Wunused -Wunused-method %s +// RUN: %clang_cc1 -fsyntax-only -verify -Wunused -Wunused-member-function %s static void f1(); // expected-warning{{unused}} |