diff options
Diffstat (limited to 'lib/Rewrite')
| -rw-r--r-- | lib/Rewrite/FixItRewriter.cpp | 2 | ||||
| -rw-r--r-- | lib/Rewrite/HTMLRewrite.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/Rewrite/FixItRewriter.cpp b/lib/Rewrite/FixItRewriter.cpp index 582096978d..9d42ac29c2 100644 --- a/lib/Rewrite/FixItRewriter.cpp +++ b/lib/Rewrite/FixItRewriter.cpp @@ -141,7 +141,7 @@ void FixItRewriter::HandleDiagnostic(Diagnostic::Level DiagLevel, } /// \brief Emit a diagnostic via the adapted diagnostic client. -void FixItRewriter::Diag(FullSourceLoc Loc, unsigned DiagID) { +void FixItRewriter::Diag(SourceLocation Loc, unsigned DiagID) { // When producing this diagnostic, we temporarily bypass ourselves, // clear out any current diagnostic, and let the downstream client // format the diagnostic. diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp index b461df462e..e6b9aa367a 100644 --- a/lib/Rewrite/HTMLRewrite.cpp +++ b/lib/Rewrite/HTMLRewrite.cpp @@ -486,7 +486,8 @@ void html::HighlightMacros(Rewriter &R, FileID FID, const Preprocessor& PP) { // Temporarily change the diagnostics object so that we ignore any generated // diagnostics from this pass. - Diagnostic TmpDiags(new IgnoringDiagClient); + Diagnostic TmpDiags(PP.getDiagnostics().getDiagnosticIDs(), + new IgnoringDiagClient); // FIXME: This is a huge hack; we reuse the input preprocessor because we want // its state, but we aren't actually changing it (we hope). This should really |