mirror of
https://github.com/nlohmann/json.git
synced 2026-10-29 17:15:42 +00:00
Merge develop into ci/path-filters
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
1 file changed
+2
-1
@@ -32,7 +32,8 @@ using nlohmann::json_editable_document;
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
constexpr std::size_t npos = std::string::npos;
|
// not constexpr: VS 2015 does not accept std::string::npos in a constant expression (C2131)
|
||||||
|
const std::size_t npos = std::string::npos;
|
||||||
|
|
||||||
// whether every value of a has the source positions of the value of b at the
|
// whether every value of a has the source positions of the value of b at the
|
||||||
// same place (a and b are equal; shallow test documents only)
|
// same place (a and b are equal; shallow test documents only)
|
||||||
|
|||||||
Reference in new issue
Block a user