gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
Milo Yip 2016-01-26 15:58:22 +08:00
parent 7f9921fc60
commit 6978f878eb
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,11 +1,8 @@
<<<<<<< HEAD
=======
/bin/* /bin/*
!/bin/data !/bin/data
!/bin/encodings !/bin/encodings
!/bin/jsonchecker !/bin/jsonchecker
!/bin/types !/bin/types
>>>>>>> master
/build /build
/doc/html /doc/html
/doc/doxygen_*.db /doc/doxygen_*.db

11
include/rapidjson/internal/stack.h
View File

@ -147,7 +147,6 @@ public:
} }
template<typename T> template<typename T>
<<<<<<< HEAD
const T* Top() const { const T* Top() const {
RAPIDJSON_ASSERT(GetSize() >= sizeof(T)); RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
return reinterpret_cast<T*>(stackTop_ - sizeof(T)); return reinterpret_cast<T*>(stackTop_ - sizeof(T));
@ -160,14 +159,10 @@ public:
const T* End() const { return reinterpret_cast<T*>(stackTop_); } const T* End() const { return reinterpret_cast<T*>(stackTop_); }
template<typename T> template<typename T>
T* Bottom() { return (T*)stack_; } T* Bottom() { return reinterpret_cast<T*>(stack_); }
template<typename T> template<typename T>
const T* Bottom() const { return (T*)stack_; } const T* Bottom() const { return reinterpret_cast<T*>(stack_); }
Allocator& GetAllocator() { return *allocator_; }
=======
T* Bottom() { return reinterpret_cast<T*>(stack_); }
bool HasAllocator() const { bool HasAllocator() const {
return allocator_ != 0; return allocator_ != 0;
@ -177,7 +172,7 @@ public:
RAPIDJSON_ASSERT(allocator_); RAPIDJSON_ASSERT(allocator_);
return *allocator_; return *allocator_;
} }
>>>>>>> master
bool Empty() const { return stackTop_ == stack_; } bool Empty() const { return stackTop_ == stack_; }
size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); } size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); } size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }