[clang-tools-extra] r210521 - Prospective build fix following clang r210518

[Alp Toker]

Author: alp
Date: Tue Jun 10 04:58:45 2014
New Revision: 210521

URL: http://llvm.org/viewvc/llvm-project?rev=210521&view=rev
Log:
Prospective build fix following clang r210518

Modified:
    clang-tools-extra/trunk/docs/pp-trace.rst
    clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp
    clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h

Modified: clang-tools-extra/trunk/docs/pp-trace.rst
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/docs/pp-trace.rst?rev=210521&r1=210520&r2=210521&view=diff
==============================================================================
--- clang-tools-extra/trunk/docs/pp-trace.rst (original)
+++ clang-tools-extra/trunk/docs/pp-trace.rst Tue Jun 10 04:58:45 2014
@@ -472,7 +472,7 @@ Argument Name    Argument Value Syntax
 ==============   ==================================================   ============================== ==============================
 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.
 ==============   ==================================================   ============================== ==============================
 

Modified: clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp?rev=210521&r1=210520&r2=210521&view=diff
==============================================================================
--- clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp (original)
+++ clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.cpp Tue Jun 10 04:58:45 2014
@@ -245,7 +245,7 @@ void PPCallbacksTracker::PragmaDiagnosti
 // 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);

Modified: clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h?rev=210521&r1=210520&r2=210521&view=diff
==============================================================================
--- clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h (original)
+++ clang-tools-extra/trunk/pp-trace/PPCallbacksTracker.h Tue Jun 10 04:58:45 2014
@@ -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,