From 1f6b2b5c82b2d2d3935b0db76352a04e9877b73f Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 20 Jan 2012 16:28:04 +0000 Subject: Extract the (InputKind, std::string) pair used to describe inputs to the front end into its own class, FrontendInputFile, to make it easier to introduce new per-input data. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148546 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/ChainedIncludesSource.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/Frontend/ChainedIncludesSource.cpp') diff --git a/lib/Frontend/ChainedIncludesSource.cpp b/lib/Frontend/ChainedIncludesSource.cpp index f1aa8a1d05..9694bc0403 100644 --- a/lib/Frontend/ChainedIncludesSource.cpp +++ b/lib/Frontend/ChainedIncludesSource.cpp @@ -63,7 +63,7 @@ ChainedIncludesSource *ChainedIncludesSource::create(CompilerInstance &CI) { assert(!includes.empty() && "No '-chain-include' in options!"); llvm::OwningPtr source(new ChainedIncludesSource()); - InputKind IK = CI.getFrontendOpts().Inputs[0].first; + InputKind IK = CI.getFrontendOpts().Inputs[0].Kind; SmallVector serialBufs; SmallVector serialBufNames; @@ -82,7 +82,8 @@ ChainedIncludesSource *ChainedIncludesSource::create(CompilerInstance &CI) { CInvok->getPreprocessorOpts().Macros.clear(); CInvok->getFrontendOpts().Inputs.clear(); - CInvok->getFrontendOpts().Inputs.push_back(std::make_pair(IK, includes[i])); + CInvok->getFrontendOpts().Inputs.push_back(FrontendInputFile(includes[i], + IK)); TextDiagnosticPrinter *DiagClient = new TextDiagnosticPrinter(llvm::errs(), DiagnosticOptions()); -- cgit v1.2.3-18-g5258