[llvm] r335995 - [dsymutil] Rename conflicting declaration

[Jonas Devlieghere via llvm-commits]

Author: jdevlieghere
Date: Fri Jun 29 10:11:34 2018
New Revision: 335995

URL: http://llvm.org/viewvc/llvm-project?rev=335995&view=rev
Log:
[dsymutil] Rename conflicting declaration

Using MemoryBuffer as member name clashed with the llvm::MemoryBuffer
class.

Modified:
    llvm/trunk/tools/dsymutil/BinaryHolder.cpp
    llvm/trunk/tools/dsymutil/BinaryHolder.h

Modified: llvm/trunk/tools/dsymutil/BinaryHolder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/BinaryHolder.cpp?rev=335995&r1=335994&r2=335995&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/BinaryHolder.cpp (original)
+++ llvm/trunk/tools/dsymutil/BinaryHolder.cpp Fri Jun 29 10:11:34 2018
@@ -51,7 +51,7 @@ Error BinaryHolder::ArchiveEntry::load(S
   if (auto Err = ErrOrBuff.getError())
     return errorCodeToError(Err);
 
-  MemoryBuffer = std::move(*ErrOrBuff);
+  MemBuffer = std::move(*ErrOrBuff);
 
   if (Verbose)
     WithColor::note() << "loaded archive '" << ArchiveFilename << "'\n";
@@ -61,15 +61,15 @@ Error BinaryHolder::ArchiveEntry::load(S
   std::vector<MemoryBufferRef> ArchiveBuffers;
 
   auto ErrOrFat =
-      object::MachOUniversalBinary::create(MemoryBuffer->getMemBufferRef());
+      object::MachOUniversalBinary::create(MemBuffer->getMemBufferRef());
   if (!ErrOrFat) {
     consumeError(ErrOrFat.takeError());
-    ArchiveBuffers.push_back(MemoryBuffer->getMemBufferRef());
+    ArchiveBuffers.push_back(MemBuffer->getMemBufferRef());
   } else {
     FatBinary = std::move(*ErrOrFat);
     FatBinaryName = ArchiveFilename;
     ArchiveBuffers =
-        getMachOFatMemoryBuffers(FatBinaryName, *MemoryBuffer, *FatBinary);
+        getMachOFatMemoryBuffers(FatBinaryName, *MemBuffer, *FatBinary);
   }
 
   // Finally, try to load the archives.
@@ -90,7 +90,7 @@ Error BinaryHolder::ObjectEntry::load(St
   if (auto Err = ErrOrBuff.getError())
     return errorCodeToError(Err);
 
-  MemoryBuffer = std::move(*ErrOrBuff);
+  MemBuffer = std::move(*ErrOrBuff);
 
   if (Verbose)
     WithColor::note() << "loaded object.\n";
@@ -100,15 +100,15 @@ Error BinaryHolder::ObjectEntry::load(St
   std::vector<MemoryBufferRef> ObjectBuffers;
 
   auto ErrOrFat =
-      object::MachOUniversalBinary::create(MemoryBuffer->getMemBufferRef());
+      object::MachOUniversalBinary::create(MemBuffer->getMemBufferRef());
   if (!ErrOrFat) {
     consumeError(ErrOrFat.takeError());
-    ObjectBuffers.push_back(MemoryBuffer->getMemBufferRef());
+    ObjectBuffers.push_back(MemBuffer->getMemBufferRef());
   } else {
     FatBinary = std::move(*ErrOrFat);
     FatBinaryName = Filename;
     ObjectBuffers =
-        getMachOFatMemoryBuffers(FatBinaryName, *MemoryBuffer, *FatBinary);
+        getMachOFatMemoryBuffers(FatBinaryName, *MemBuffer, *FatBinary);
   }
 
   Objects.reserve(ObjectBuffers.size());

Modified: llvm/trunk/tools/dsymutil/BinaryHolder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/BinaryHolder.h?rev=335995&r1=335994&r2=335995&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/BinaryHolder.h (original)
+++ llvm/trunk/tools/dsymutil/BinaryHolder.h Fri Jun 29 10:11:34 2018
@@ -46,7 +46,7 @@ public:
   /// Base class shared by cached entries, representing objects and archives.
   class EntryBase {
   protected:
-    std::unique_ptr<MemoryBuffer> MemoryBuffer;
+    std::unique_ptr<MemoryBuffer> MemBuffer;
     std::unique_ptr<object::MachOUniversalBinary> FatBinary;
     std::string FatBinaryName;
   };