amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-06 06:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let the BSON index-name helper only fill its output parameter

Browse Source 
It returned a reference to the string it filled, so callers held a second
name for index_name. Addresses review feedback.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-24 22:37:46 +02:00
parent 448a130c54
commit bba3fdbb65
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/output/binary_writer.hpp
+7 -7
View File
@@ -1331,16 +1331,15 @@ class binary_writer
}; };
/*! /*!
@brief the name BSON gives the array element with index @a index @brief creates the name BSON gives the array element with index @a index
@param[out] name receives the decimal index @param[out] name receives the decimal index
*/ */
static const string_t& bson_index_name(const std::size_t index, string_t& name) static void create_bson_index_name(const std::size_t index, string_t& name)
{ {
// the index is built as a std::string; convert explicitly, as the // the index is built as a std::string; convert explicitly, as the
// two are only implicitly convertible for some string types // two are only implicitly convertible for some string types
const auto key = std::to_string(index); const auto key = std::to_string(index);
name = string_t(key.data(), key.size()); name = string_t(key.data(), key.size());
return name;
} }
/*! /*!
@@ -1400,7 +1399,8 @@ class binary_writer
while (nested == nullptr && current.index < array.size()) while (nested == nullptr && current.index < array.size())
{ {
const BasicJsonType& el = array[current.index]; const BasicJsonType& el = array[current.index];
current.entries_size += calc_bson_entry_header_size(bson_index_name(current.index, index_name), el); create_bson_index_name(current.index, index_name);
current.entries_size += calc_bson_entry_header_size(index_name, el);
++current.index; ++current.index;
if (el.is_structured()) if (el.is_structured())
{ {
@@ -1489,16 +1489,16 @@ class binary_writer
while (nested == nullptr && current.index < array.size()) while (nested == nullptr && current.index < array.size())
{ {
const BasicJsonType& el = array[current.index]; const BasicJsonType& el = array[current.index];
const string_t& name = bson_index_name(current.index, index_name); create_bson_index_name(current.index, index_name);
++current.index; ++current.index;
if (el.is_structured()) if (el.is_structured())
{ {
nested_name = &name; nested_name = &index_name;
nested = &el; nested = &el;
} }
else else
{ {
write_bson_value(name, el); write_bson_value(index_name, el);
} }
} }
} }
single_include/nlohmann/json.hpp
+7 -7
View File
@@ -20359,16 +20359,15 @@ class binary_writer
}; };
/*! /*!
@brief the name BSON gives the array element with index @a index @brief creates the name BSON gives the array element with index @a index
@param[out] name receives the decimal index @param[out] name receives the decimal index
*/ */
static const string_t& bson_index_name(const std::size_t index, string_t& name) static void create_bson_index_name(const std::size_t index, string_t& name)
{ {
// the index is built as a std::string; convert explicitly, as the // the index is built as a std::string; convert explicitly, as the
// two are only implicitly convertible for some string types // two are only implicitly convertible for some string types
const auto key = std::to_string(index); const auto key = std::to_string(index);
name = string_t(key.data(), key.size()); name = string_t(key.data(), key.size());
return name;
} }
/*! /*!
@@ -20428,7 +20427,8 @@ class binary_writer
while (nested == nullptr && current.index < array.size()) while (nested == nullptr && current.index < array.size())
{ {
const BasicJsonType& el = array[current.index]; const BasicJsonType& el = array[current.index];
current.entries_size += calc_bson_entry_header_size(bson_index_name(current.index, index_name), el); create_bson_index_name(current.index, index_name);
current.entries_size += calc_bson_entry_header_size(index_name, el);
++current.index; ++current.index;
if (el.is_structured()) if (el.is_structured())
{ {
@@ -20517,16 +20517,16 @@ class binary_writer
while (nested == nullptr && current.index < array.size()) while (nested == nullptr && current.index < array.size())
{ {
const BasicJsonType& el = array[current.index]; const BasicJsonType& el = array[current.index];
const string_t& name = bson_index_name(current.index, index_name); create_bson_index_name(current.index, index_name);
++current.index; ++current.index;
if (el.is_structured()) if (el.is_structured())
{ {
nested_name = &name; nested_name = &index_name;
nested = &el; nested = &el;
} }
else else
{ {
write_bson_value(name, el); write_bson_value(index_name, el);
} }
} }
} }