[compiler-rt] r333625 - [XRay] Fixup: Address some warnings breaking build

[Dean Michael Berris via llvm-commits]

Author: dberris
Date: Wed May 30 21:55:11 2018
New Revision: 333625

URL: http://llvm.org/viewvc/llvm-project?rev=333625&view=rev
Log:
[XRay] Fixup: Address some warnings breaking build

Follow-up to D45758.

Modified:
    compiler-rt/trunk/lib/xray/xray_profile_collector.h
    compiler-rt/trunk/lib/xray/xray_segmented_array.h

Modified: compiler-rt/trunk/lib/xray/xray_profile_collector.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/xray_profile_collector.h?rev=333625&r1=333624&r2=333625&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/xray_profile_collector.h (original)
+++ compiler-rt/trunk/lib/xray/xray_profile_collector.h Wed May 30 21:55:11 2018
@@ -81,7 +81,7 @@ void reset();
 /// provided in the XRay API.
 XRayBuffer nextBuffer(XRayBuffer B);
 
-}; // namespace profileCollectorService
+} // namespace profileCollectorService
 
 } // namespace __xray
 

Modified: compiler-rt/trunk/lib/xray/xray_segmented_array.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/xray_segmented_array.h?rev=333625&r1=333624&r2=333625&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/xray_segmented_array.h (original)
+++ compiler-rt/trunk/lib/xray/xray_segmented_array.h Wed May 30 21:55:11 2018
@@ -66,7 +66,7 @@ private:
 
   static Chunk SentinelChunk;
 
-  AllocatorType *Allocator;
+  AllocatorType *Alloc;
   Chunk *Head = &SentinelChunk;
   Chunk *Tail = &SentinelChunk;
   size_t Size = 0;
@@ -88,7 +88,7 @@ private:
       return FreeChunk;
     }
 
-    auto Block = Allocator->Allocate();
+    auto Block = Alloc->Allocate();
     if (Block.Data == nullptr)
       return nullptr;
     // TODO: Maybe use a separate managed allocator for Chunk instances?
@@ -200,11 +200,11 @@ private:
   };
 
 public:
-  explicit Array(AllocatorType &A) : Allocator(&A) {}
+  explicit Array(AllocatorType &A) : Alloc(&A) {}
   Array() : Array(GetGlobalAllocator()) {}
 
   Array(const Array &) = delete;
-  Array(Array &&O) NOEXCEPT : Allocator(O.Allocator),
+  Array(Array &&O) NOEXCEPT : Alloc(O.Alloc),
                               Head(O.Head),
                               Tail(O.Tail),
                               Size(O.Size) {
@@ -216,8 +216,8 @@ public:
   bool empty() const { return Size == 0; }
 
   AllocatorType &allocator() const {
-    DCHECK_NE(Allocator, nullptr);
-    return *Allocator;
+    DCHECK_NE(Alloc, nullptr);
+    return *Alloc;
   }
 
   size_t size() const { return Size; }