From 3f755aa7a8e74920c65e4805e35824b03ca2945d Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Mon, 10 Mar 2014 17:55:02 +0000 Subject: [C++11] Avoid implicit conversion of ArrayRef to std::vector and use move semantics where appropriate. llvm-svn: 203477 --- clang/lib/Basic/VirtualFileSystem.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'clang/lib/Basic/VirtualFileSystem.cpp') diff --git a/clang/lib/Basic/VirtualFileSystem.cpp b/clang/lib/Basic/VirtualFileSystem.cpp index bfc2db73e88..9a88cfd3897 100644 --- a/clang/lib/Basic/VirtualFileSystem.cpp +++ b/clang/lib/Basic/VirtualFileSystem.cpp @@ -253,13 +253,9 @@ class DirectoryEntry : public Entry { public: virtual ~DirectoryEntry(); -#if LLVM_HAS_RVALUE_REFERENCES DirectoryEntry(StringRef Name, std::vector Contents, Status S) : Entry(EK_Directory, Name), Contents(std::move(Contents)), S(std::move(S)) {} -#endif - DirectoryEntry(StringRef Name, ArrayRef Contents, const Status &S) - : Entry(EK_Directory, Name), Contents(Contents), S(S) {} Status getStatus() { return S; } typedef std::vector::iterator iterator; iterator contents_begin() { return Contents.begin(); } @@ -612,7 +608,7 @@ class VFSFromYAMLParser { for (sys::path::reverse_iterator I = sys::path::rbegin(Parent), E = sys::path::rend(Parent); I != E; ++I) { - Result = new DirectoryEntry(*I, Result, + Result = new DirectoryEntry(*I, llvm::makeArrayRef(Result), Status("", "", getNextVirtualUniqueID(), sys::TimeValue::now(), 0, 0, 0, file_type::directory_file, sys::fs::all_all)); } -- cgit v1.2.3