Merge 6ac67bc634 into 6f8e36ac3d
This commit is contained in:
commit
aa7edbba45
@ -4697,7 +4697,7 @@ class basic_json
|
||||
if (c >= 0x00 and c <= 0x1f)
|
||||
{
|
||||
// print character c as \uxxxx
|
||||
sprintf(&result[pos + 1], "u%04x", int(c));
|
||||
sprintf_s(&result[pos + 1],result.size(),"u%04x", int(c));
|
||||
pos += 6;
|
||||
// overwrite trailing null character
|
||||
result[pos] = '\\';
|
||||
@ -4929,7 +4929,7 @@ class basic_json
|
||||
static constexpr difference_type end_value = begin_value + 1;
|
||||
|
||||
/// iterator as signed integer type
|
||||
difference_type m_it = std::numeric_limits<std::ptrdiff_t>::min();
|
||||
difference_type m_it = std::numeric_limits<std::ptrdiff_t>::denorm_min();
|
||||
};
|
||||
|
||||
/*!
|
||||
|
||||
Loading…
Reference in New Issue
Block a user