Eliminate -Wadl warnings exposed by the previous commit.

Quuxplusone · Aug 13, 2018 · 59e6af8 · 59e6af8
1 parent 9ff8914
commit 59e6af8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp
@@ -323,7 +323,7 @@ int Command::Execute(ArrayRef<llvm::Optional<StringRef>> Redirects,
     assert(Environment.back() == nullptr &&
            "Environment vector should be null-terminated by now");
     ArgvVectorStorage = llvm::toStringRefArray(Environment.data());
-    Env = makeArrayRef(ArgvVectorStorage);
+    Env = llvm::makeArrayRef(ArgvVectorStorage);
   }
 
   if (ResponseFile == nullptr) {

diff --git a/unittests/Basic/VirtualFileSystemTest.cpp b/unittests/Basic/VirtualFileSystemTest.cpp
@@ -975,7 +975,7 @@ class VFSFromYAMLTest : public ::testing::Test {
   getFromYAMLRawString(StringRef Content,
                        IntrusiveRefCntPtr<vfs::FileSystem> ExternalFS) {
     std::unique_ptr<MemoryBuffer> Buffer = MemoryBuffer::getMemBuffer(Content);
-    return getVFSFromYAML(std::move(Buffer), CountingDiagHandler, "", this,
+    return vfs::getVFSFromYAML(std::move(Buffer), CountingDiagHandler, "", this,
                           ExternalFS);
   }
 

diff --git a/unittests/Rename/ClangRenameTest.h b/unittests/Rename/ClangRenameTest.h
@@ -79,7 +79,7 @@ class ClangRenameTest : public testing::Test,
             FileContents))
       return "";
 
-    formatAndApplyAllReplacements(FileToReplacements, Context.Rewrite, "llvm");
+    tooling::formatAndApplyAllReplacements(FileToReplacements, Context.Rewrite, "llvm");
     return Context.getRewrittenText(InputFileID);
   }