[clang-tools-extra] r212390 - Track changes from clang r212387, r212388

[Alp Toker]

Author: alp
Date: Sun Jul  6 00:29:14 2014
New Revision: 212390

URL: http://llvm.org/viewvc/llvm-project?rev=212390&view=rev
Log:
Track changes from clang r212387, r212388

Modified:
    clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp
    clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.h

Modified: clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp?rev=212390&r1=212389&r2=212390&view=diff
==============================================================================
--- clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp (original)
+++ clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.cpp Sun Jul  6 00:29:14 2014
@@ -215,7 +215,7 @@ ModuleMapChecker::ModuleMapChecker(Strin
       Diagnostics(
           new DiagnosticsEngine(DiagIDs, DiagnosticOpts.get(), &DC, false)),
       TargetOpts(new ModuleMapTargetOptions()),
-      Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts.get())),
+      Target(TargetInfo::CreateTargetInfo(*Diagnostics, TargetOpts)),
       FileMgr(new FileManager(FileSystemOpts)),
       SourceMgr(new SourceManager(*Diagnostics, *FileMgr, false)),
       HeaderSearchOpts(new HeaderSearchOptions()),

Modified: clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.h?rev=212390&r1=212389&r2=212390&view=diff
==============================================================================
--- clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.h (original)
+++ clang-tools-extra/trunk/module-map-checker/ModuleMapChecker.h Sun Jul  6 00:29:14 2014
@@ -59,7 +59,7 @@ class ModuleMapChecker {
   // Supporting objects.
 
   /// Options controlling the language variant.
-  llvm::IntrusiveRefCntPtr<clang::LangOptions> LangOpts;
+  std::shared_ptr<clang::LangOptions> LangOpts;
   /// Diagnostic IDs.
   const llvm::IntrusiveRefCntPtr<clang::DiagnosticIDs> DiagIDs;
   /// Options controlling the diagnostic engine.
@@ -69,7 +69,7 @@ class ModuleMapChecker {
   /// Diagnostic engine.
   llvm::IntrusiveRefCntPtr<clang::DiagnosticsEngine> Diagnostics;
   /// Options controlling the target.
-  llvm::IntrusiveRefCntPtr<clang::TargetOptions> TargetOpts;
+  std::shared_ptr<clang::TargetOptions> TargetOpts;
   /// Target information.
   llvm::IntrusiveRefCntPtr<clang::TargetInfo> Target;
   /// Options controlling the file system manager.