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

GenericStringRef: add NOEXCEPT, add ASSERT

Browse Source 
* constructor from array is RAPIDJSON_NOEXCEPT
 * constructor from plain pointer missed an assert
This commit is contained in:
Philipp A. Hartmann 2014-08-31 22:01:57 +02:00
parent 56625bd9f0
commit 8ae2266c3b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rapidjson/document.h
View File

@ -279,7 +279,7 @@ struct GenericStringRef {
GenericValue instead. GenericValue instead.
*/ */
template<SizeType N> template<SizeType N>
GenericStringRef(const CharType (&str)[N]) GenericStringRef(const CharType (&str)[N]) RAPIDJSON_NOEXCEPT
: s(str), length(N-1) {} : s(str), length(N-1) {}
//! Explicitly create string reference from \c const character pointer //! Explicitly create string reference from \c const character pointer
@ -302,7 +302,7 @@ struct GenericStringRef {
GenericValue instead. GenericValue instead.
*/ */
explicit GenericStringRef(const CharType* str) explicit GenericStringRef(const CharType* str)
: s(str), length(internal::StrLen(str)){} : s(str), length(internal::StrLen(str)){ RAPIDJSON_ASSERT(s != NULL); }
//! Create constant string reference from pointer and length //! Create constant string reference from pointer and length
/*! \param str constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue /*! \param str constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue