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

polish patch to remove ci errors

Browse Source
This commit is contained in:
Qianqian Fang 2022-02-28 12:48:18 -05:00
parent 4c9dd311bd
commit 5786991973
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nlohmann/detail/input/binary_reader.hpp
View File

@ -2435,11 +2435,7 @@ class binary_reader
} }
} }
if (JSON_HEDLEY_UNLIKELY((!sax->end_array() || !sax->end_object()))) return (sax->end_array() && sax->end_object());
{
return false;
}
return true;
} }
if (size_and_type.first != string_t::npos) if (size_and_type.first != string_t::npos)

4
include/nlohmann/detail/output/binary_writer.hpp
View File

@ -1609,11 +1609,11 @@ class binary_writer
}; };
string_t key = "_ArrayType_"; string_t key = "_ArrayType_";
if (bjdtype.find(value.at(key)) == bjdtype.end()) if (bjdtype.find(std::string(value.at(key))) == bjdtype.end())
{ {
return 1; return 1;
} }
CharType dtype = bjdtype[value.at(key)]; CharType dtype = bjdtype[std::string(value.at(key))];
key = "_ArraySize_"; key = "_ArraySize_";
std::size_t len = (value.at(key).empty() ? 0 : 1); std::size_t len = (value.at(key).empty() ? 0 : 1);

10
single_include/nlohmann/json.hpp
View File

@ -10811,11 +10811,7 @@ class binary_reader
} }
} }
if (JSON_HEDLEY_UNLIKELY((!sax->end_array() || !sax->end_object()))) return (sax->end_array() && sax->end_object());
{
return false;
}
return true;
} }
if (size_and_type.first != string_t::npos) if (size_and_type.first != string_t::npos)
@ -15505,11 +15501,11 @@ class binary_writer
}; };
string_t key = "_ArrayType_"; string_t key = "_ArrayType_";
if (bjdtype.find(value.at(key)) == bjdtype.end()) if (bjdtype.find(std::string(value.at(key))) == bjdtype.end())
{ {
return 1; return 1;
} }
CharType dtype = bjdtype[value.at(key)]; CharType dtype = bjdtype[std::string(value.at(key))];
key = "_ArraySize_"; key = "_ArraySize_";
std::size_t len = (value.at(key).empty() ? 0 : 1); std::size_t len = (value.at(key).empty() ? 0 : 1);