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

Merge branch 'master' into cxx11warnings

Browse Source
This commit is contained in:
Milo Yip 2016-01-23 14:19:12 +08:00
commit 534da223f7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rapidjson/reader.h
View File

@ -678,7 +678,7 @@ private:
++length_; ++length_;
} }
RAPIDJSON_FORCEINLINE void* Push(size_t count) { RAPIDJSON_FORCEINLINE void* Push(SizeType count) {
length_ += count; length_ += count;
return stack_.template Push<Ch>(count); return stack_.template Push<Ch>(count);
} }
@ -829,13 +829,13 @@ private:
const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3); const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x)); unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
if (RAPIDJSON_UNLIKELY(r != 0)) { // some of characters is escaped if (RAPIDJSON_UNLIKELY(r != 0)) { // some of characters is escaped
size_t length; SizeType length;
#ifdef _MSC_VER // Find the index of first escaped #ifdef _MSC_VER // Find the index of first escaped
unsigned long offset; unsigned long offset;
_BitScanForward(&offset, r); _BitScanForward(&offset, r);
length = offset; length = offset;
#else #else
length = static_cast<size_t>(__builtin_ffs(r) - 1); length = static_cast<SizeType>(__builtin_ffs(r) - 1);
#endif #endif
char* q = reinterpret_cast<char*>(os.Push(length)); char* q = reinterpret_cast<char*>(os.Push(length));
for (size_t i = 0; i < length; i++) for (size_t i = 0; i < length; i++)