13 Commits

Author	SHA1	Message	Date
Niels Lohmann	3a80823ff8	🔀 merge develop branch and resolve conflicts	2020-07-11 13:21:13 +02:00
gatopeich	f9a1fec272	Remove redundant comment	2020-07-11 00:34:02 +01:00
Agustín F. Pozuelo	25f5d75e6e	Fix compilation for xcode 9.x	2020-07-03 01:44:18 +01:00
Agustín F. Pozuelo	93770467a1	Precisely 4 template arguments for the sake of clang 3.6 (?)	2020-07-03 01:28:54 +01:00
Agustín F. Pozuelo	0fc261f0f2	Make ordered_map compatible with GCC 5.5	2020-07-03 00:33:31 +01:00
gatopeich	49f26a0250	Have 4 template parameters for ordered_map	2020-06-29 17:32:55 +01:00
gatopeich	d08fca2bb9	Use const Key in ordered map ... (forgotten in previous commit!)	2020-06-23 15:44:46 +01:00
gatopeich	fb8c11f25c	Re-implement ordered_map::erase, ... so that it can handle pair<const Key,...>	2020-06-23 15:01:20 +01:00
gatopeich	ddf0a45abb	Use AllocatorType<ObjectType::value_type>, ... instead of hard-coding it for std::map's value_type	2020-06-22 18:35:46 +01:00
gatopeich	15337b2cc3	Ignore allocator hardcoded to match std::map	2020-06-22 00:03:48 +01:00
gatopeich	27aaf6f845	Clean-up ordered_map declarations	2020-06-21 22:28:03 +01:00
Niels Lohmann	6ee9e5f402	⚗️ remove const from value type	2020-06-20 13:23:44 +02:00
Niels Lohmann	4fd0d02b6f	🚧 toward an ordered_json type	2020-06-19 15:27:05 +02:00