From ac4e8e5fcad38e749a1e151b124fd3e71c6747a6 Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Sun, 22 Jun 2014 21:58:33 +0000 Subject: DiagnosticIDs: use diagnostic severities to simplify extension handling llvm-svn: 211479 --- clang/lib/Serialization/ASTReader.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'clang/lib/Serialization/ASTReader.cpp') diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 777ea831981..5ac6ccc10e9 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -328,13 +328,11 @@ static bool checkDiagnosticGroupMappings(DiagnosticsEngine &StoredDiags, return false; } -static DiagnosticsEngine::ExtensionHandling -isExtHandlingFromDiagsError(DiagnosticsEngine &Diags) { - DiagnosticsEngine::ExtensionHandling Ext = - Diags.getExtensionHandlingBehavior(); - if (Ext == DiagnosticsEngine::Ext_Warn && Diags.getWarningsAsErrors()) - Ext = DiagnosticsEngine::Ext_Error; - return Ext; +static bool isExtHandlingFromDiagsError(DiagnosticsEngine &Diags) { + diag::Severity Ext = Diags.getExtensionHandlingBehavior(); + if (Ext == diag::Severity::Warning && Diags.getWarningsAsErrors()) + return true; + return Ext >= diag::Severity::Error; } static bool checkDiagnosticMappings(DiagnosticsEngine &StoredDiags, -- cgit v1.2.3