[lld] r233548 - [Mips] Rename class method merge => mergeHeaderFlags

[Simon Atanasyan]

Author: atanasyan
Date: Mon Mar 30 10:07:05 2015
New Revision: 233548

URL: http://llvm.org/viewvc/llvm-project?rev=233548&view=rev
Log:
[Mips] Rename class method merge => mergeHeaderFlags

No functional changes.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h
    lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFReader.h

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp?rev=233548&r1=233547&r2=233548&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp Mon Mar 30 10:07:05 2015
@@ -64,7 +64,8 @@ MipsELFFlagsMerger::MipsELFFlagsMerger(b
 
 uint32_t MipsELFFlagsMerger::getMergedELFFlags() const { return _flags; }
 
-std::error_code MipsELFFlagsMerger::merge(uint8_t newClass, uint32_t newFlags) {
+std::error_code MipsELFFlagsMerger::mergeHeaderFlags(uint8_t newClass,
+                                                     uint32_t newFlags) {
   // Check bitness.
   if (_is64Bit != (newClass == ELFCLASS64))
     return make_dynamic_error_code(

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h?rev=233548&r1=233547&r2=233548&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h Mon Mar 30 10:07:05 2015
@@ -22,7 +22,7 @@ public:
   uint32_t getMergedELFFlags() const;
 
   /// \brief Merge saved ELF header flags and the new set of flags.
-  std::error_code merge(uint8_t newClass, uint32_t newFlags);
+  std::error_code mergeHeaderFlags(uint8_t newClass, uint32_t newFlags);
 
 private:
   const bool _is64Bit;

Modified: lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFReader.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFReader.h?rev=233548&r1=233547&r2=233548&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFReader.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Mips/MipsELFReader.h Mon Mar 30 10:07:05 2015
@@ -43,7 +43,7 @@ public:
   loadFile(std::unique_ptr<MemoryBuffer> mb, const Registry &registry,
            std::vector<std::unique_ptr<File>> &result) const override {
     auto &hdr = *this->elfHeader(*mb);
-    if (std::error_code ec = _flagMerger.merge(hdr.getFileClass(), hdr.e_flags))
+    if (auto ec = _flagMerger.mergeHeaderFlags(hdr.getFileClass(), hdr.e_flags))
       return ec;
     return BaseReaderType::loadFile(std::move(mb), registry, result);
   }
@@ -65,7 +65,7 @@ public:
   loadFile(std::unique_ptr<MemoryBuffer> mb, const Registry &registry,
            std::vector<std::unique_ptr<File>> &result) const override {
     auto &hdr = *this->elfHeader(*mb);
-    if (std::error_code ec = _flagMerger.merge(hdr.getFileClass(), hdr.e_flags))
+    if (auto ec = _flagMerger.mergeHeaderFlags(hdr.getFileClass(), hdr.e_flags))
       return ec;
     return BaseReaderType::loadFile(std::move(mb), registry, result);
   }