X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=include%2Fllvm%2FObject%2FMachOUniversal.h;h=47e93c26b46a26609cfbeed8506e0c97bda12a97;hp=d27c824a87a0b7b0a97e72572d0066cd72471d37;hb=5c792faa0e5560bc148c973f3df658eb3bb2061e;hpb=7418e1f4bd5a4bda32af18f46ff2837221d12d5c

diff --git a/include/llvm/Object/MachOUniversal.h b/include/llvm/Object/MachOUniversal.h
index d27c824a87a..47e93c26b46 100644
--- a/include/llvm/Object/MachOUniversal.h
+++ b/include/llvm/Object/MachOUniversal.h
@@ -53,9 +53,9 @@ public:
     ObjectForArch getNext() const { return ObjectForArch(Parent, Index + 1); }
     uint32_t getCPUType() const { return Header.cputype; }
 
-    error_code getAsObjectFile(std::unique_ptr<ObjectFile> &Result) const;
+    std::error_code getAsObjectFile(std::unique_ptr<ObjectFile> &Result) const;
 
-    error_code getAsArchive(std::unique_ptr<Archive> &Result) const;
+    std::error_code getAsArchive(std::unique_ptr<Archive> &Result) const;
   };
 
   class object_iterator {
@@ -79,7 +79,7 @@ public:
     }
   };
 
-  MachOUniversalBinary(MemoryBuffer *Source, error_code &ec);
+  MachOUniversalBinary(MemoryBuffer *Source, std::error_code &ec);
   static ErrorOr<MachOUniversalBinary*> create(MemoryBuffer *Source);
 
   object_iterator begin_objects() const {
@@ -96,8 +96,8 @@ public:
     return V->isMachOUniversalBinary();
   }
 
-  error_code getObjectForArch(Triple::ArchType Arch,
-                              std::unique_ptr<ObjectFile> &Result) const;
+  std::error_code getObjectForArch(Triple::ArchType Arch,
+                                   std::unique_ptr<ObjectFile> &Result) const;
 };
 
 }