From 27583e993aee508361fdccffc107c2f2765698ef Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 14 Aug 2019 15:02:21 -0400 Subject: CPPCompiler::OutputMessage -> CPPCompiler::Diagnostic (#1019) * CPPCompiler::OutputMessage -> CPPCompiler::Diagnostic * Fix problem with merge. * Fix another small merge issue around Diagnostic. --- tools/slang-test/slang-test-main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index 99a139e3c..4a830fd92 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -1317,8 +1317,8 @@ static String _calcSummary(const CPPCompiler::Output& inOutput) CPPCompiler::Output output(inOutput); // We only want to analyse errors for now - output.removeByType(CPPCompiler::OutputMessage::Type::Info); - output.removeByType(CPPCompiler::OutputMessage::Type::Warning); + output.removeByType(CPPCompiler::Diagnostic::Type::Info); + output.removeByType(CPPCompiler::Diagnostic::Type::Warning); StringBuilder builder; @@ -1411,7 +1411,7 @@ static TestResult runCPPCompilerCompile(TestContext* context, TestInput& input) return TestResult::Fail; } - if (output.getCountByType(CPPCompiler::OutputMessage::Type::Error) > 0) + if (output.getCountByType(CPPCompiler::Diagnostic::Type::Error) > 0) { return TestResult::Fail; } -- cgit v1.2.3