1 files changed, 14 insertions, 13 deletions

diff --git a/clang/unittests/Basic/VirtualFileSystemTest.cpp b/clang/unittests/Basic/VirtualFileSystemTest.cpp
index 6d05049c789..63d533614ce 100644
--- a/clang/unittests/Basic/VirtualFileSystemTest.cpp
+++ b/clang/unittests/Basic/VirtualFileSystemTest.cpp
@@ -38,14 +38,14 @@ public:
       return std::make_error_code(std::errc::no_such_file_or_directory);
     return I->second;
   }
-  error_code openFileForRead(const Twine &Path,
-                             std::unique_ptr<vfs::File> &Result) {
+  std::error_code openFileForRead(const Twine &Path,
+                                  std::unique_ptr<vfs::File> &Result) {
     llvm_unreachable("unimplemented");
   }
-  error_code getBufferForFile(const Twine &Name,
-                              std::unique_ptr<MemoryBuffer> &Result,
-                              int64_t FileSize = -1,
-                              bool RequiresNullTerminator = true) {
+  std::error_code getBufferForFile(const Twine &Name,
+                                   std::unique_ptr<MemoryBuffer> &Result,
+                                   int64_t FileSize = -1,
+                                   bool RequiresNullTerminator = true) {
     llvm_unreachable("unimplemented");
   }
 
@@ -75,7 +75,7 @@ public:
 
 TEST(VirtualFileSystemTest, StatusQueries) {
   IntrusiveRefCntPtr<DummyFileSystem> D(new DummyFileSystem());
-  ErrorOr<vfs::Status> Status((error_code()));
+  ErrorOr<vfs::Status> Status((std::error_code()));
 
   D->addRegularFile("/foo");
   Status = D->status("/foo");
@@ -115,7 +115,7 @@ TEST(VirtualFileSystemTest, StatusQueries) {
 
 TEST(VirtualFileSystemTest, BaseOnlyOverlay) {
   IntrusiveRefCntPtr<DummyFileSystem> D(new DummyFileSystem());
-  ErrorOr<vfs::Status> Status((error_code()));
+  ErrorOr<vfs::Status> Status((std::error_code()));
   EXPECT_FALSE(Status = D->status("/foo"));
 
   IntrusiveRefCntPtr<vfs::OverlayFileSystem> O(new vfs::OverlayFileSystem(D));
@@ -125,7 +125,7 @@ TEST(VirtualFileSystemTest, BaseOnlyOverlay) {
   Status = D->status("/foo");
   EXPECT_FALSE(Status.getError());
 
-  ErrorOr<vfs::Status> Status2((error_code()));
+  ErrorOr<vfs::Status> Status2((std::error_code()));
   Status2 = O->status("/foo");
   EXPECT_FALSE(Status2.getError());
   EXPECT_TRUE(Status->equivalent(*Status2));
@@ -140,9 +140,10 @@ TEST(VirtualFileSystemTest, OverlayFiles) {
   O->pushOverlay(Middle);
   O->pushOverlay(Top);
 
-  ErrorOr<vfs::Status> Status1((error_code())), Status2((error_code())),
-      Status3((error_code())), StatusB((error_code())), StatusM((error_code())),
-      StatusT((error_code()));
+  ErrorOr<vfs::Status> Status1((std::error_code())),
+      Status2((std::error_code())), Status3((std::error_code())),
+      StatusB((std::error_code())), StatusM((std::error_code())),
+      StatusT((std::error_code()));
 
   Base->addRegularFile("/foo");
   StatusB = Base->status("/foo");
@@ -201,7 +202,7 @@ TEST(VirtualFileSystemTest, MergedDirPermissions) {
       new vfs::OverlayFileSystem(Lower));
   O->pushOverlay(Upper);
 
-  ErrorOr<vfs::Status> Status((error_code()));
+  ErrorOr<vfs::Status> Status((std::error_code()));
   Lower->addDirectory("/both", sys::fs::owner_read);
   Upper->addDirectory("/both", sys::fs::owner_all | sys::fs::group_read);
   Status = O->status("/both");