Stack<>: add _ suffix to member ownAllocator_

For consistency, all member variables should follow the same pattern.
starwalker · Oct 30, 2014 · d0c2832 · d0c2832
1 parent 4fa43bd
commit d0c2832
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/include/rapidjson/internal/stack.h b/include/rapidjson/internal/stack.h
@@ -35,23 +35,23 @@ class Stack {
 public:
     // Optimization note: Do not allocate memory for stack_ in constructor.
     // Do it lazily when first Push() -> Expand() -> Resize().
-    Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
+    Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
         RAPIDJSON_ASSERT(stackCapacity > 0);
         if (!allocator_)
-            ownAllocator = allocator_ = RAPIDJSON_NEW(Allocator());
+            ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator());
     }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
     Stack(Stack&& rhs)
         : allocator_(rhs.allocator_),
-          ownAllocator(rhs.ownAllocator),
+          ownAllocator_(rhs.ownAllocator_),
           stack_(rhs.stack_),
           stackTop_(rhs.stackTop_),
           stackEnd_(rhs.stackEnd_),
           initialCapacity_(rhs.initialCapacity_)
     {
         rhs.allocator_ = 0;
-        rhs.ownAllocator = 0;
+        rhs.ownAllocator_ = 0;
         rhs.stack_ = 0;
         rhs.stackTop_ = 0;
         rhs.stackEnd_ = 0;
@@ -70,14 +70,14 @@ class Stack {
             Destroy();
 
             allocator_ = rhs.allocator_;
-            ownAllocator = rhs.ownAllocator;
+            ownAllocator_ = rhs.ownAllocator_;
             stack_ = rhs.stack_;
             stackTop_ = rhs.stackTop_;
             stackEnd_ = rhs.stackEnd_;
             initialCapacity_ = rhs.initialCapacity_;
 
             rhs.allocator_ = 0;
-            rhs.ownAllocator = 0;
+            rhs.ownAllocator_ = 0;
             rhs.stack_ = 0;
             rhs.stackTop_ = 0;
             rhs.stackEnd_ = 0;
@@ -162,15 +162,15 @@ class Stack {
 
     void Destroy() {
         Allocator::Free(stack_);
-        RAPIDJSON_DELETE(ownAllocator); // Only delete if it is owned by the stack
+        RAPIDJSON_DELETE(ownAllocator_); // Only delete if it is owned by the stack
     }
 
     // Prohibit copy constructor & assignment operator.
     Stack(const Stack&);
     Stack& operator=(const Stack&);
 
     Allocator* allocator_;
-    Allocator* ownAllocator;
+    Allocator* ownAllocator_;
     char *stack_;
     char *stackTop_;
     char *stackEnd_;