Author: dblaikie
Date: Thu Jan 5 19:09:06 2017
New Revision: 291203
URL: http://llvm.org/viewvc/llvm-project?rev=291203&view=rev
Log:
Fixes for Clang API change
Modified:
clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp
clang-tools-extra/trunk/modularize/ModularizeUtilities.h
Modified: clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp?rev=291203&r1=291202&r2=291203&view=diff
==============================================================================
--- clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp (original)
+++ clang-tools-extra/trunk/modularize/ModularizeUtilities.cpp Thu Jan 5
19:09:06 2017
@@ -44,25 +44,22 @@ public:
ModularizeUtilities::ModularizeUtilities(std::vector<std::string> &InputPaths,
llvm::StringRef Prefix,
llvm::StringRef ProblemFilesListPath)
- : InputFilePaths(InputPaths),
- HeaderPrefix(Prefix),
- ProblemFilesPath(ProblemFilesListPath),
- HasModuleMap(false),
- MissingHeaderCount(0),
- // Init clang stuff needed for loading the module map and preprocessing.
- LangOpts(new LangOptions()), DiagIDs(new DiagnosticIDs()),
- DiagnosticOpts(new DiagnosticOptions()),
- DC(llvm::errs(), DiagnosticOpts.get()),
- Diagnostics(
- new DiagnosticsEngine(DiagIDs, DiagnosticOpts.get(), &DC, false)),
- TargetOpts(new ModuleMapTargetOptions()),
- Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts)),
- FileMgr(new FileManager(FileSystemOpts)),
- SourceMgr(new SourceManager(*Diagnostics, *FileMgr, false)),
- HeaderSearchOpts(new HeaderSearchOptions()),
- HeaderInfo(new HeaderSearch(HeaderSearchOpts, *SourceMgr, *Diagnostics,
- *LangOpts, Target.get())) {
-}
+ : InputFilePaths(InputPaths), HeaderPrefix(Prefix),
+ ProblemFilesPath(ProblemFilesListPath), HasModuleMap(false),
+ MissingHeaderCount(0),
+ // Init clang stuff needed for loading the module map and preprocessing.
+ LangOpts(new LangOptions()), DiagIDs(new DiagnosticIDs()),
+ DiagnosticOpts(new DiagnosticOptions()),
+ DC(llvm::errs(), DiagnosticOpts.get()),
+ Diagnostics(
+ new DiagnosticsEngine(DiagIDs, DiagnosticOpts.get(), &DC, false)),
+ TargetOpts(new ModuleMapTargetOptions()),
+ Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts)),
+ FileMgr(new FileManager(FileSystemOpts)),
+ SourceMgr(new SourceManager(*Diagnostics, *FileMgr, false)),
+ HeaderInfo(new HeaderSearch(std::make_shared<HeaderSearchOptions>(),
+ *SourceMgr, *Diagnostics, *LangOpts,
+ Target.get())) {}
// Create instance of ModularizeUtilities, to simplify setting up
// subordinate objects.
Modified: clang-tools-extra/trunk/modularize/ModularizeUtilities.h
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/ModularizeUtilities.h?rev=291203&r1=291202&r2=291203&view=diff
==============================================================================
--- clang-tools-extra/trunk/modularize/ModularizeUtilities.h (original)
+++ clang-tools-extra/trunk/modularize/ModularizeUtilities.h Thu Jan 5
19:09:06 2017
@@ -214,8 +214,6 @@ public:
llvm::IntrusiveRefCntPtr<clang::FileManager> FileMgr;
/// Source manager.
llvm::IntrusiveRefCntPtr<clang::SourceManager> SourceMgr;
- /// Options controlling the \#include directive.
- llvm::IntrusiveRefCntPtr<clang::HeaderSearchOptions> HeaderSearchOpts;
/// Header search manager.
std::unique_ptr<clang::HeaderSearch> HeaderInfo;
// The loaded module map objects.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
