From 4e85b8ae413fa00fa42aa3e625c2db3b1932f8d3 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Mon, 26 Sep 2011 00:21:47 +0000 Subject: [PATCH] Rename ChainedDiagnosticClient to ChainedDiagnosticConsumer as per issue 5397 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140485 91177308-0d34-0410-b5e6-96231b3b80d8 --- ...iagnosticClient.h => ChainedDiagnosticConsumer.h} | 12 ++++++------ lib/Frontend/CompilerInstance.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) rename include/clang/Frontend/{ChainedDiagnosticClient.h => ChainedDiagnosticConsumer.h} (80%) diff --git a/include/clang/Frontend/ChainedDiagnosticClient.h b/include/clang/Frontend/ChainedDiagnosticConsumer.h similarity index 80% rename from include/clang/Frontend/ChainedDiagnosticClient.h rename to include/clang/Frontend/ChainedDiagnosticConsumer.h index 4fe0702252..5def0d85c8 100644 --- a/include/clang/Frontend/ChainedDiagnosticClient.h +++ b/include/clang/Frontend/ChainedDiagnosticConsumer.h @@ -1,4 +1,4 @@ -//===--- ChainedDiagnosticClient.h - Chain Diagnostic Clients ---*- C++ -*-===// +//===- ChainedDiagnosticConsumer.h - Chain Diagnostic Clients ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_FRONTEND_CHAINEDDIAGNOSTICCLIENT_H -#define LLVM_CLANG_FRONTEND_CHAINEDDIAGNOSTICCLIENT_H +#ifndef LLVM_CLANG_FRONTEND_CHAINEDDIAGNOSTICCONSUMER_H +#define LLVM_CLANG_FRONTEND_CHAINEDDIAGNOSTICCONSUMER_H #include "clang/Basic/Diagnostic.h" #include "llvm/ADT/OwningPtr.h" @@ -16,16 +16,16 @@ namespace clang { class LangOptions; -/// ChainedDiagnosticClient - Chain two diagnostic clients so that diagnostics +/// ChainedDiagnosticConsumer - Chain two diagnostic clients so that diagnostics /// go to the first client and then the second. The first diagnostic client /// should be the "primary" client, and will be used for computing whether the /// diagnostics should be included in counts. -class ChainedDiagnosticClient : public DiagnosticConsumer { +class ChainedDiagnosticConsumer : public DiagnosticConsumer { llvm::OwningPtr Primary; llvm::OwningPtr Secondary; public: - ChainedDiagnosticClient(DiagnosticConsumer *_Primary, + ChainedDiagnosticConsumer(DiagnosticConsumer *_Primary, DiagnosticConsumer *_Secondary) { Primary.reset(_Primary); Secondary.reset(_Secondary); diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index fcc9246dd9..c4dd651458 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -19,7 +19,7 @@ #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/Preprocessor.h" #include "clang/Lex/PTHManager.h" -#include "clang/Frontend/ChainedDiagnosticClient.h" +#include "clang/Frontend/ChainedDiagnosticConsumer.h" #include "clang/Frontend/FrontendAction.h" #include "clang/Frontend/FrontendActions.h" #include "clang/Frontend/FrontendDiagnostic.h" @@ -106,7 +106,7 @@ static void SetUpBuildDumpLog(const DiagnosticOptions &DiagOpts, // Chain in a diagnostic client which will log the diagnostics. DiagnosticConsumer *Logger = new TextDiagnosticPrinter(*OS.take(), DiagOpts, /*OwnsOutputStream=*/true); - Diags.setClient(new ChainedDiagnosticClient(Diags.takeClient(), Logger)); + Diags.setClient(new ChainedDiagnosticConsumer(Diags.takeClient(), Logger)); } static void SetUpDiagnosticLog(const DiagnosticOptions &DiagOpts, @@ -136,7 +136,7 @@ static void SetUpDiagnosticLog(const DiagnosticOptions &DiagOpts, OwnsStream); if (CodeGenOpts) Logger->setDwarfDebugFlags(CodeGenOpts->DwarfDebugFlags); - Diags.setClient(new ChainedDiagnosticClient(Diags.takeClient(), Logger)); + Diags.setClient(new ChainedDiagnosticConsumer(Diags.takeClient(), Logger)); } void CompilerInstance::createDiagnostics(int Argc, const char* const *Argv, -- 2.50.1