diff options
| author | Alp Toker <alp@nuanti.com> | 2014-07-05 03:04:33 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-07-05 03:04:33 +0000 |
| commit | b7b57b1d214a03e03d31e2ed6df395326d566c5a (patch) | |
| tree | 917329ac40cd55c67e3d6a842aed30f366a372d9 | |
| parent | dcb3eb33e0d04cb6f8ff85b8a96b8df1769328ae (diff) | |
Track IntrusiveRefCntPtr::get() changes from LLVM r212366
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@212367 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp | 2 | ||||
| -rw-r--r-- | clang-modernize/tool/ClangModernize.cpp | 2 | ||||
| -rw-r--r-- | module-map-checker/ModuleMapChecker.cpp | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp b/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp index d0af35e2..5c825b79 100644 --- a/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp +++ b/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp @@ -212,7 +212,7 @@ int main(int argc, char **argv) { IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts(new DiagnosticOptions()); DiagnosticsEngine Diagnostics( IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), - DiagOpts.getPtr()); + DiagOpts.get()); // Determine a formatting style from options. format::FormatStyle FormatStyle; diff --git a/clang-modernize/tool/ClangModernize.cpp b/clang-modernize/tool/ClangModernize.cpp index 31e8925b..21fed4bd 100644 --- a/clang-modernize/tool/ClangModernize.cpp +++ b/clang-modernize/tool/ClangModernize.cpp @@ -395,7 +395,7 @@ int main(int argc, const char **argv) { new DiagnosticOptions()); DiagnosticsEngine Diagnostics( llvm::IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), - DiagOpts.getPtr()); + DiagOpts.get()); // FIXME: Make this DiagnosticsEngine available to all Transforms probably via // GlobalOptions. diff --git a/module-map-checker/ModuleMapChecker.cpp b/module-map-checker/ModuleMapChecker.cpp index 23d75dc5..955432e9 100644 --- a/module-map-checker/ModuleMapChecker.cpp +++ b/module-map-checker/ModuleMapChecker.cpp @@ -211,17 +211,17 @@ ModuleMapChecker::ModuleMapChecker(StringRef ModuleMapPath, DumpModuleMap(DumpModuleMap), CommandLine(CommandLine), LangOpts(new LangOptions()), DiagIDs(new DiagnosticIDs()), DiagnosticOpts(new DiagnosticOptions()), - DC(errs(), DiagnosticOpts.getPtr()), + DC(errs(), DiagnosticOpts.get()), Diagnostics( - new DiagnosticsEngine(DiagIDs, DiagnosticOpts.getPtr(), &DC, false)), + new DiagnosticsEngine(DiagIDs, DiagnosticOpts.get(), &DC, false)), TargetOpts(new ModuleMapTargetOptions()), - Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts.getPtr())), + Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts.get())), FileMgr(new FileManager(FileSystemOpts)), SourceMgr(new SourceManager(*Diagnostics, *FileMgr, false)), HeaderSearchOpts(new HeaderSearchOptions()), HeaderInfo(new HeaderSearch(HeaderSearchOpts, *SourceMgr, *Diagnostics, - *LangOpts, Target.getPtr())), - ModMap(new ModuleMap(*SourceMgr, *Diagnostics, *LangOpts, Target.getPtr(), + *LangOpts, Target.get())), + ModMap(new ModuleMap(*SourceMgr, *Diagnostics, *LangOpts, Target.get(), *HeaderInfo)) {} // Create instance of ModuleMapChecker, to simplify setting up |