External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚧 fix preprocessor check

Browse Source
This commit is contained in:
Niels Lohmann 2021-01-02 13:58:05 +01:00
parent ecaab32ef0
commit c6e7fa21ed
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
1 changed files with 16 additions and 16 deletions

32
include/nlohmann/json.hpp
View File

@ -1642,7 +1642,7 @@ class basic_json
std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref) std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref)
{ {
auto element = element_ref.moved_or_copied(); auto element = element_ref.moved_or_copied();
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
(*element.m_value.array)[1].m_parent = this; (*element.m_value.array)[1].m_parent = this;
#endif #endif
m_value.object->emplace( m_value.object->emplace(
@ -1655,7 +1655,7 @@ class basic_json
// the initializer list describes an array -> create array // the initializer list describes an array -> create array
m_type = value_t::array; m_type = value_t::array;
m_value.array = create<array_t>(init.begin(), init.end()); m_value.array = create<array_t>(init.begin(), init.end());
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
for (auto& element : *m_value.array) for (auto& element : *m_value.array)
{ {
element.m_parent = this; element.m_parent = this;
@ -2155,7 +2155,7 @@ class basic_json
basic_json(basic_json&& other) noexcept basic_json(basic_json&& other) noexcept
: m_type(std::move(other.m_type)), : m_type(std::move(other.m_type)),
m_value(std::move(other.m_value)) m_value(std::move(other.m_value))
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
, m_parent(other.m_parent) , m_parent(other.m_parent)
#endif #endif
{ {
@ -2709,7 +2709,7 @@ class basic_json
std::string diagnostics() const std::string diagnostics() const
{ {
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
std::vector<std::string> tokens; std::vector<std::string> tokens;
for (const basic_json* current = this; current->m_parent != nullptr; current = current->m_parent) for (const basic_json* current = this; current->m_parent != nullptr; current = current->m_parent)
{ {
@ -3384,7 +3384,7 @@ class basic_json
{ {
JSON_TRY JSON_TRY
{ {
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
reference result = m_value.array->at(idx); reference result = m_value.array->at(idx);
result.m_parent = this; result.m_parent = this;
return result; return result;
@ -3488,7 +3488,7 @@ class basic_json
{ {
JSON_TRY JSON_TRY
{ {
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
reference result = m_value.object->at(key); reference result = m_value.object->at(key);
result.m_parent = this; result.m_parent = this;
return result; return result;
@ -3603,12 +3603,12 @@ class basic_json
m_value.array->insert(m_value.array->end(), m_value.array->insert(m_value.array->end(),
idx - m_value.array->size() + 1, idx - m_value.array->size() + 1,
basic_json()); basic_json());
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
m_value.array->back().m_parent = this; m_value.array->back().m_parent = this;
#endif #endif
} }
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
reference result = m_value.array->operator[](idx); reference result = m_value.array->operator[](idx);
result.m_parent = this; result.m_parent = this;
return result; return result;
@ -3690,7 +3690,7 @@ class basic_json
// operator[] only works for objects // operator[] only works for objects
if (JSON_HEDLEY_LIKELY(is_object())) if (JSON_HEDLEY_LIKELY(is_object()))
{ {
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
reference result = m_value.object->operator[](key); reference result = m_value.object->operator[](key);
result.m_parent = this; result.m_parent = this;
return result; return result;
@ -3786,7 +3786,7 @@ class basic_json
// at only works for objects // at only works for objects
if (JSON_HEDLEY_LIKELY(is_object())) if (JSON_HEDLEY_LIKELY(is_object()))
{ {
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
reference result = m_value.object->operator[](key); reference result = m_value.object->operator[](key);
result.m_parent = this; result.m_parent = this;
return result; return result;
@ -5348,7 +5348,7 @@ class basic_json
// add element to array (move semantics) // add element to array (move semantics)
m_value.array->push_back(std::move(val)); m_value.array->push_back(std::move(val));
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
m_value.array->back().m_parent = this; m_value.array->back().m_parent = this;
#endif #endif
// if val is moved from, basic_json move constructor marks it null so we do not call the destructor // if val is moved from, basic_json move constructor marks it null so we do not call the destructor
@ -5386,7 +5386,7 @@ class basic_json
// add element to array // add element to array
m_value.array->push_back(val); m_value.array->push_back(val);
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
m_value.array->back().m_parent = this; m_value.array->back().m_parent = this;
#endif #endif
} }
@ -5438,7 +5438,7 @@ class basic_json
} }
// add element to object // add element to object
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
auto res = m_value.object->insert(val); auto res = m_value.object->insert(val);
res.first->second.m_parent = this; res.first->second.m_parent = this;
#else #else
@ -5547,7 +5547,7 @@ class basic_json
// add element to array (perfect forwarding) // add element to array (perfect forwarding)
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
reference result = m_value.array->emplace_back(std::forward<Args>(args)...); reference result = m_value.array->emplace_back(std::forward<Args>(args)...);
result.m_parent = this; result.m_parent = this;
return result; return result;
@ -5556,7 +5556,7 @@ class basic_json
#endif #endif
#else #else
m_value.array->emplace_back(std::forward<Args>(args)...); m_value.array->emplace_back(std::forward<Args>(args)...);
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
m_value.array->back().m_parent = this; m_value.array->back().m_parent = this;
#endif #endif
return m_value.array->back(); return m_value.array->back();
@ -7086,7 +7086,7 @@ class basic_json
/// the value of the current element /// the value of the current element
json_value m_value = {}; json_value m_value = {};
#ifdef JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
/// a pointer to a parent value (for debugging purposes) /// a pointer to a parent value (for debugging purposes)
basic_json* m_parent = nullptr; basic_json* m_parent = nullptr;
#endif #endif