From 573583e2f2e4addac559bd02a1138d959a7c7683 Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Sat, 5 Jul 2014 03:04:33 +0000 Subject: [PATCH] Track IntrusiveRefCntPtr::get() changes from LLVM r212366 llvm-svn: 212367 --- .../tool/ClangApplyReplacementsMain.cpp | 2 +- clang-tools-extra/clang-modernize/tool/ClangModernize.cpp | 2 +- clang-tools-extra/module-map-checker/ModuleMapChecker.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp index d0af35e..5c825b7 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp +++ b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp @@ -212,7 +212,7 @@ int main(int argc, char **argv) { IntrusiveRefCntPtr DiagOpts(new DiagnosticOptions()); DiagnosticsEngine Diagnostics( IntrusiveRefCntPtr(new DiagnosticIDs()), - DiagOpts.getPtr()); + DiagOpts.get()); // Determine a formatting style from options. format::FormatStyle FormatStyle; diff --git a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp index 31e8925..21fed4b 100644 --- a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp +++ b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp @@ -395,7 +395,7 @@ int main(int argc, const char **argv) { new DiagnosticOptions()); DiagnosticsEngine Diagnostics( llvm::IntrusiveRefCntPtr(new DiagnosticIDs()), - DiagOpts.getPtr()); + DiagOpts.get()); // FIXME: Make this DiagnosticsEngine available to all Transforms probably via // GlobalOptions. diff --git a/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp b/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp index 23d75dc..955432e 100644 --- a/clang-tools-extra/module-map-checker/ModuleMapChecker.cpp +++ b/clang-tools-extra/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 -- 2.7.4