diff options
| -rw-r--r-- | clang/include/clang/Sema/DelayedDiagnostic.h | 2 | ||||
| -rw-r--r-- | clang/lib/ARCMigrate/ARCMT.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Basic/VirtualFileSystem.cpp | 6 | ||||
| -rw-r--r-- | clang/lib/StaticAnalyzer/Core/RegionStore.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/clang/include/clang/Sema/DelayedDiagnostic.h b/clang/include/clang/Sema/DelayedDiagnostic.h index 0a3b9f59261..9a0541d8774 100644 --- a/clang/include/clang/Sema/DelayedDiagnostic.h +++ b/clang/include/clang/Sema/DelayedDiagnostic.h @@ -261,7 +261,7 @@ public: if (pool.Diagnostics.empty()) return; if (Diagnostics.empty()) { - Diagnostics = llvm_move(pool.Diagnostics); + Diagnostics = std::move(pool.Diagnostics); } else { Diagnostics.append(pool.pool_begin(), pool.pool_end()); } diff --git a/clang/lib/ARCMigrate/ARCMT.cpp b/clang/lib/ARCMigrate/ARCMT.cpp index 7894c58ea45..0593a362ef6 100644 --- a/clang/lib/ARCMigrate/ARCMT.cpp +++ b/clang/lib/ARCMigrate/ARCMT.cpp @@ -204,7 +204,7 @@ createInvocationForMigration(CompilerInvocation &origCI) { WarnOpts.push_back(*I); } WarnOpts.push_back("error=arc-unsafe-retained-assign"); - CInvok->getDiagnosticOpts().Warnings = llvm_move(WarnOpts); + CInvok->getDiagnosticOpts().Warnings = std::move(WarnOpts); CInvok->getLangOpts()->ObjCARCWeak = HasARCRuntime(origCI); diff --git a/clang/lib/Basic/VirtualFileSystem.cpp b/clang/lib/Basic/VirtualFileSystem.cpp index c32df5bf750..f21cff6e0f3 100644 --- a/clang/lib/Basic/VirtualFileSystem.cpp +++ b/clang/lib/Basic/VirtualFileSystem.cpp @@ -110,7 +110,7 @@ ErrorOr<Status> RealFile::status() { return EC; Status NewS(RealStatus); NewS.setName(S.getName()); - S = llvm_move(NewS); + S = std::move(NewS); } return S; } @@ -592,11 +592,11 @@ class VFSFromYAMLParser { Entry *Result = 0; switch (Kind) { case EK_File: - Result = new FileEntry(LastComponent, llvm_move(ExternalContentsPath), + Result = new FileEntry(LastComponent, std::move(ExternalContentsPath), UseExternalName); break; case EK_Directory: - Result = new DirectoryEntry(LastComponent, llvm_move(EntryArrayContents), + Result = new DirectoryEntry(LastComponent, std::move(EntryArrayContents), Status("", "", getNextVirtualUniqueID(), sys::TimeValue::now(), 0, 0, 0, file_type::directory_file, sys::fs::all_all)); break; diff --git a/clang/lib/StaticAnalyzer/Core/RegionStore.cpp b/clang/lib/StaticAnalyzer/Core/RegionStore.cpp index 245491c9fd0..059e5137ae8 100644 --- a/clang/lib/StaticAnalyzer/Core/RegionStore.cpp +++ b/clang/lib/StaticAnalyzer/Core/RegionStore.cpp @@ -1787,7 +1787,7 @@ RegionStoreManager::getInterestingValues(nonloc::LazyCompoundVal LCV) { // values to return. const ClusterBindings *Cluster = B.lookup(LazyR->getBaseRegion()); if (!Cluster) - return (LazyBindingsMap[LCV.getCVData()] = llvm_move(List)); + return (LazyBindingsMap[LCV.getCVData()] = std::move(List)); SmallVector<BindingPair, 32> Bindings; collectSubRegionBindings(Bindings, svalBuilder, *Cluster, LazyR, @@ -1809,7 +1809,7 @@ RegionStoreManager::getInterestingValues(nonloc::LazyCompoundVal LCV) { List.push_back(V); } - return (LazyBindingsMap[LCV.getCVData()] = llvm_move(List)); + return (LazyBindingsMap[LCV.getCVData()] = std::move(List)); } NonLoc RegionStoreManager::createLazyBinding(RegionBindingsConstRef B, |
