summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlp Toker <alp@nuanti.com>2014-06-10 09:58:45 +0000
committerAlp Toker <alp@nuanti.com>2014-06-10 09:58:45 +0000
commit9d63b5eb7f00f8072b74fd701fc89f5060d7aff9 (patch)
tree6ac8243923299e595c709b753330c6d33a41254b
parentc141ad4b7535e01a7c5a2540753ffac89058cd40 (diff)
downloadbcm5719-llvm-9d63b5eb7f00f8072b74fd701fc89f5060d7aff9.tar.gz
bcm5719-llvm-9d63b5eb7f00f8072b74fd701fc89f5060d7aff9.zip
Prospective build fix following clang r210518
llvm-svn: 210521
-rw-r--r--clang-tools-extra/docs/pp-trace.rst2
-rw-r--r--clang-tools-extra/pp-trace/PPCallbacksTracker.cpp2
-rw-r--r--clang-tools-extra/pp-trace/PPCallbacksTracker.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/clang-tools-extra/docs/pp-trace.rst b/clang-tools-extra/docs/pp-trace.rst
index a9341749b0c..5ea9dd69f81 100644
--- a/clang-tools-extra/docs/pp-trace.rst
+++ b/clang-tools-extra/docs/pp-trace.rst
@@ -472,7 +472,7 @@ Argument Name Argument Value Syntax Clang C++
============== ================================================== ============================== ==============================
Loc "(file):(line):(col)" SourceLocation The location of the directive.
Namespace (name) StringRef Namespace name.
-mapping (0|MAP_IGNORE|MAP_WARNING|MAP_ERROR|MAP_FATAL) diag::Mapping Mapping type.
+mapping (0|MAP_IGNORE|MAP_WARNING|MAP_ERROR|MAP_FATAL) diag::Severity Mapping type.
Str (string) StringRef Warning/error name.
============== ================================================== ============================== ==============================
diff --git a/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp b/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
index b2ac92034b2..e2d654a5a8c 100644
--- a/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
+++ b/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp
@@ -245,7 +245,7 @@ void PPCallbacksTracker::PragmaDiagnosticPop(clang::SourceLocation Loc,
// Callback invoked when a #pragma gcc dianostic directive is read.
void PPCallbacksTracker::PragmaDiagnostic(clang::SourceLocation Loc,
llvm::StringRef Namespace,
- clang::diag::Mapping Mapping,
+ clang::diag::Severity Mapping,
llvm::StringRef Str) {
beginCallback("PragmaDiagnostic");
appendArgument("Loc", Loc);
diff --git a/clang-tools-extra/pp-trace/PPCallbacksTracker.h b/clang-tools-extra/pp-trace/PPCallbacksTracker.h
index bf06423c6f2..dab29fedd0f 100644
--- a/clang-tools-extra/pp-trace/PPCallbacksTracker.h
+++ b/clang-tools-extra/pp-trace/PPCallbacksTracker.h
@@ -118,7 +118,7 @@ public:
void PragmaDiagnosticPop(clang::SourceLocation Loc,
llvm::StringRef Namespace) override;
void PragmaDiagnostic(clang::SourceLocation Loc, llvm::StringRef Namespace,
- clang::diag::Mapping mapping,
+ clang::diag::Severity mapping,
llvm::StringRef Str) override;
void PragmaOpenCLExtension(clang::SourceLocation NameLoc,
const clang::IdentifierInfo *Name,
OpenPOWER on IntegriCloud