diff options
Diffstat (limited to 'include/clang/Driver/Driver.h')
| -rw-r--r-- | include/clang/Driver/Driver.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/clang/Driver/Driver.h b/include/clang/Driver/Driver.h index 73c808609355..df974ad1d760 100644 --- a/include/clang/Driver/Driver.h +++ b/include/clang/Driver/Driver.h @@ -15,11 +15,11 @@ #include "clang/Driver/Phases.h" #include "clang/Driver/Types.h" #include "clang/Driver/Util.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Triple.h" #include "llvm/Support/Path.h" // FIXME: Kill when CompilationInfo +#include <memory> // lands. #include <list> #include <set> @@ -188,12 +188,11 @@ private: // getFinalPhase - Determine which compilation mode we are in and record // which option we used to determine the final phase. phases::ID getFinalPhase(const llvm::opt::DerivedArgList &DAL, - llvm::opt::Arg **FinalPhaseArg = 0) const; + llvm::opt::Arg **FinalPhaseArg = nullptr) const; public: Driver(StringRef _ClangExecutable, StringRef _DefaultTargetTriple, - StringRef _DefaultImageName, DiagnosticsEngine &_Diags); ~Driver(); @@ -259,7 +258,7 @@ public: /// \param Args - The input arguments. /// \param Inputs - The list to store the resulting compilation /// inputs onto. - void BuildInputs(const ToolChain &TC, const llvm::opt::DerivedArgList &Args, + void BuildInputs(const ToolChain &TC, llvm::opt::DerivedArgList &Args, InputList &Inputs) const; /// BuildActions - Construct the list of actions to perform for the |