riyyi/manafiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Util: Make second to last element detection more compatible

Browse Source 
std::prev doesn't work on std::unordered_map, this patch makes it work.
This commit is contained in:
Riyyi
2022-07-18 12:50:09 +02:00
parent c3f5df7a29
commit 161be80fd6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/json/serializer.cpp
+7 -5
View File
@@ -5,7 +5,7 @@
*/ */
#include <cstdint> // uint32_t #include <cstdint> // uint32_t
#include <iterator> // prev #include <iterator> // next
#include <sstream> // ostringstream #include <sstream> // ostringstream
#include <string> #include <string>
@@ -74,12 +74,13 @@ void Serializer::dumpArray(const Value& value, const uint32_t indentLevel)
} }
auto values = value.m_value.array->elements(); auto values = value.m_value.array->elements();
for (auto it = values.begin(); it != values.end(); ++it) { auto last = values.end();
for (auto it = values.begin(); it != last; ++it) {
m_output += std::string(m_indent * (indentLevel + 1), m_indentCharacter); m_output += std::string(m_indent * (indentLevel + 1), m_indentCharacter);
dumpHelper(*it, indentLevel + 1); dumpHelper(*it, indentLevel + 1);
// Add comma, except after the last element // Add comma, except after the last element
if (it != std::prev(values.end(), 1)) { if (std::next(it) != last) {
m_output += ","; m_output += ",";
} }
if (m_indent > 0) { if (m_indent > 0) {
@@ -103,7 +104,8 @@ void Serializer::dumpObject(const Value& value, const uint32_t indentLevel)
} }
auto members = value.m_value.object->members(); auto members = value.m_value.object->members();
for (auto it = members.begin(); it != members.end(); ++it) { auto last = members.end();
for (auto it = members.begin(); it != last; ++it) {
m_output += std::string(m_indent * (indentLevel + 1), m_indentCharacter); m_output += std::string(m_indent * (indentLevel + 1), m_indentCharacter);
m_output += "\"" + it->first + "\":"; m_output += "\"" + it->first + "\":";
if (m_indent > 0) { if (m_indent > 0) {
@@ -112,7 +114,7 @@ void Serializer::dumpObject(const Value& value, const uint32_t indentLevel)
dumpHelper(it->second, indentLevel + 1); dumpHelper(it->second, indentLevel + 1);
// Add comma, except after the last element // Add comma, except after the last element
if (it != std::prev(members.end(), 1)) { if (std::next(it) != last) {
m_output += ","; m_output += ",";
} }
if (m_indent > 0) { if (m_indent > 0) {