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

from_json: add missing template arguments for std::map

Browse Source
This commit is contained in:
Théo DELRIEU 2018-06-18 10:52:11 +02:00
parent e830bc502f
commit 299469cfd5
No known key found for this signature in database
GPG Key ID: A5A505438C20539A
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/detail/conversions/from_json.hpp
View File

@ -278,10 +278,10 @@ void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
}
template <typename BasicJsonType, typename Key, typename Value,
template <typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
typename = enable_if_t<not std::is_constructible<
typename BasicJsonType::string_t, Key>::value>>
void from_json(const BasicJsonType& j, std::map<Key, Value>& m)
void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
{
if (JSON_UNLIKELY(not j.is_array()))
{