j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 add NLOHMANN_JSON prefix and undef macros

Browse source
This commit is contained in:
Niels Lohmann 2019-07-01 22:24:39 +02:00
parent 1720bfedd1
commit 897362191d
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
20 changed files with 4055 additions and 2294 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/nlohmann/detail/output/serializer.hpp
View file

@ -110,7 +110,7 @@ class serializer
// variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step;
if (HEDLEY_UNLIKELY(indent_string.size() < new_indent))
if (NLOHMANN_JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize(indent_string.size() * 2, ' ');
}
@ -183,7 +183,7 @@ class serializer
// variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step;
if (HEDLEY_UNLIKELY(indent_string.size() < new_indent))
if (NLOHMANN_JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize(indent_string.size() * 2, ' ');
}
@ -498,7 +498,7 @@ class serializer
}
// we finished processing the string
if (HEDLEY_LIKELY(state == UTF8_ACCEPT))
if (NLOHMANN_JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
{
// write buffer
if (bytes > 0)