1 files changed, 18 insertions, 17 deletions

diff --git a/lld/lib/ReaderWriter/FileArchive.cpp b/lld/lib/ReaderWriter/FileArchive.cpp
index 549d4ffcccb..8563cf3fc82 100644
--- a/lld/lib/ReaderWriter/FileArchive.cpp
+++ b/lld/lib/ReaderWriter/FileArchive.cpp
@@ -77,14 +77,14 @@ public:
   virtual bool isWholeArchive() const { return _isWholeArchive; }
 
   /// \brief parse each member
-  error_code
+  std::error_code
   parseAllMembers(std::vector<std::unique_ptr<File>> &result) const override {
     for (auto mf = _archive->child_begin(), me = _archive->child_end();
          mf != me; ++mf) {
-      if (error_code ec = instantiateMember(mf, result))
+      if (std::error_code ec = instantiateMember(mf, result))
         return ec;
     }
-    return error_code();
+    return std::error_code();
   }
 
   const atom_collection<DefinedAtom> &defined() const override {
@@ -103,7 +103,7 @@ public:
     return _absoluteAtoms;
   }
 
-  error_code buildTableOfContents() {
+  std::error_code buildTableOfContents() {
     DEBUG_WITH_TYPE("FileArchive", llvm::dbgs()
                                        << "Table of contents for archive '"
                                        << _archive->getFileName() << "':\n");
@@ -111,9 +111,9 @@ public:
          i != e; ++i) {
       StringRef name;
       Archive::child_iterator member;
-      if (error_code ec = i->getName(name))
+      if (std::error_code ec = i->getName(name))
         return ec;
-      if (error_code ec = i->getMember(member))
+      if (std::error_code ec = i->getMember(member))
         return ec;
       DEBUG_WITH_TYPE(
           "FileArchive",
@@ -121,7 +121,7 @@ public:
                        << "'" << name << "'\n");
       _symbolMemberMap[name] = member;
     }
-    return error_code();
+    return std::error_code();
   }
 
   /// Returns a set of all defined symbols in the archive.
@@ -133,24 +133,25 @@ public:
   }
 
 protected:
-  error_code
+  std::error_code
   instantiateMember(Archive::child_iterator member,
                     std::vector<std::unique_ptr<File>> &result) const {
     std::unique_ptr<MemoryBuffer> mb;
-    if (error_code ec = member->getMemoryBuffer(mb, true))
+    if (std::error_code ec = member->getMemoryBuffer(mb, true))
       return ec;
     if (_logLoading)
       llvm::outs() << mb->getBufferIdentifier() << "\n";
     _registry.parseFile(mb, result);
     const char *memberStart = member->getBuffer().data();
     _membersInstantiated.insert(memberStart);
-    return error_code();
+    return std::error_code();
   }
 
   // Parses the given memory buffer as an object file, and returns success error
   // code if the given symbol is a data symbol. If the symbol is not a data
   // symbol or does not exist, returns a failure.
-  error_code isDataSymbol(std::unique_ptr<MemoryBuffer> mb, StringRef symbol) const {
+  std::error_code isDataSymbol(std::unique_ptr<MemoryBuffer> mb,
+                               StringRef symbol) const {
     auto objOrErr(ObjectFile::createObjectFile(mb.release()));
     if (auto ec = objOrErr.getError())
       return ec;
@@ -163,7 +164,7 @@ protected:
 
     for (symbol_iterator i = ibegin; i != iend; ++i) {
       // Get symbol name
-      if (error_code ec = i->getName(symbolname))
+      if (std::error_code ec = i->getName(symbolname))
         return ec;
       if (symbolname != symbol)
         continue;
@@ -175,11 +176,11 @@ protected:
         continue;
 
       // Get Symbol Type
-      if (error_code ec = i->getType(symtype))
+      if (std::error_code ec = i->getType(symtype))
         return ec;
 
       if (symtype == SymbolRef::ST_Data)
-        return error_code();
+        return std::error_code();
     }
     return object_error::parse_failed;
   }
@@ -209,11 +210,11 @@ public:
     return (magic == llvm::sys::fs::file_magic::archive);
   }
 
-  error_code
+  std::error_code
   parseFile(std::unique_ptr<MemoryBuffer> &mb, const Registry &reg,
             std::vector<std::unique_ptr<File>> &result) const override {
     // Make Archive object which will be owned by FileArchive object.
-    error_code ec;
+    std::error_code ec;
     Archive *archive = new Archive(mb.get(), ec);
     if (ec)
       return ec;
@@ -229,7 +230,7 @@ public:
     mb.release();
 
     result.push_back(std::move(file));
-    return error_code();
+    return std::error_code();
   }
 
 private: