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

Merge pull request #1013 from pah/fixes/1010-assert-stringref

Browse Source 
GenericStringRef: move assert out of expression
This commit is contained in:
Milo Yip 2017-07-11 10:25:47 +08:00 committed by GitHub
commit 1a77513e6d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/rapidjson/document.h
View File

@ -308,7 +308,7 @@ struct GenericStringRef {
*/ */
#endif #endif
explicit GenericStringRef(const CharType* str) explicit GenericStringRef(const CharType* str)
: s(str), length(((RAPIDJSON_ASSERT(str != 0)), internal::StrLen(str))) {} : s(str), length(NotNullStrLen(str)) {}
//! Create constant string reference from pointer and length //! Create constant string reference from pointer and length
#ifndef __clang__ // -Wdocumentation #ifndef __clang__ // -Wdocumentation
@ -331,6 +331,11 @@ struct GenericStringRef {
const SizeType length; //!< length of the string (excluding the trailing NULL terminator) const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
private: private:
SizeType NotNullStrLen(const CharType* str) {
RAPIDJSON_ASSERT(str != 0);
return internal::StrLen(str);
}
/// Empty string - used when passing in a NULL pointer /// Empty string - used when passing in a NULL pointer
static const Ch emptyString[]; static const Ch emptyString[];