diff options
-rw-r--r-- | include/clang/Basic/Diagnostic.h | 2 | ||||
-rw-r--r-- | lib/Basic/Diagnostic.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h index c587a1d6e2..3aa1d55c10 100644 --- a/include/clang/Basic/Diagnostic.h +++ b/include/clang/Basic/Diagnostic.h @@ -479,7 +479,7 @@ public: /// \brief Add the specified mapping to all diagnostics. Mainly to be used /// by -Wno-everything to disable all warnings but allow subsequent -W options /// to enable specific warnings. - bool setMappingToAllDiagnostics(diag::Mapping Map, + void setMappingToAllDiagnostics(diag::Mapping Map, SourceLocation Loc = SourceLocation()); bool hasErrorOccurred() const { return ErrorOccurred; } diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp index eab79d6442..369c32dc12 100644 --- a/lib/Basic/Diagnostic.cpp +++ b/lib/Basic/Diagnostic.cpp @@ -295,7 +295,7 @@ bool DiagnosticsEngine::setDiagnosticGroupErrorAsFatal(StringRef Group, return false; } -bool DiagnosticsEngine::setMappingToAllDiagnostics(diag::Mapping Map, +void DiagnosticsEngine::setMappingToAllDiagnostics(diag::Mapping Map, SourceLocation Loc) { // Get all the diagnostics. llvm::SmallVector<diag::kind, 64> AllDiags; @@ -305,8 +305,6 @@ bool DiagnosticsEngine::setMappingToAllDiagnostics(diag::Mapping Map, for (unsigned i = 0, e = AllDiags.size(); i != e; ++i) if (Diags->isBuiltinWarningOrExtension(AllDiags[i])) setDiagnosticMapping(AllDiags[i], Map, Loc); - - return false; } void DiagnosticsEngine::Report(const StoredDiagnostic &storedDiag) { |