j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔀 merge develop branch and resolve conflicts

Browse source
This commit is contained in:
Niels Lohmann 2020-07-11 13:21:13 +02:00
parent 9c21285133
commit 3a80823ff8
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 89 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/ordered_map.hpp
View file

@ -12,7 +12,7 @@ namespace nlohmann
/// for use within nlohmann::basic_json<ordered_map>
template <class Key, class T, class IgnoredLess = std::less<Key>,
class Allocator = std::allocator<std::pair<const Key, T>>>
struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
{
using key_type = Key;
using mapped_type = T;