haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

💚 fix compilation

pull/2269/head
Niels Lohmann 2020-07-14 14:34:55 +02:00
parent 5b229f4cce
commit 33b0bed7fe
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nlohmann/detail/hash.hpp
View File

@ -1,5 +1,6 @@
#pragma once
#include <cstddef> // size_t
#include <functional> // hash
namespace nlohmann
@ -19,7 +20,7 @@ std::size_t hash(const BasicJsonType& j)
switch (j.type())
{
case BasicJsonType::value_t::null:
case BasicJsonType::discarded:
case BasicJsonType::value_t::discarded:
return combine(static_cast<std::size_t>(j.type()), 0);
case BasicJsonType::value_t::object:

3
single_include/nlohmann/json.hpp
View File

@ -4445,6 +4445,7 @@ class byte_container_with_subtype : public BinaryType
// #include <nlohmann/detail/hash.hpp>
#include <cstddef> // size_t
#include <functional> // hash
namespace nlohmann
@ -4464,7 +4465,7 @@ std::size_t hash(const BasicJsonType& j)
switch (j.type())
{
case BasicJsonType::value_t::null:
case BasicJsonType::discarded:
case BasicJsonType::value_t::discarded:
return combine(static_cast<std::size_t>(j.type()), 0);
case BasicJsonType::value_t::object: