gatopeich
f62b4626be
Removing comment about AllocatorType per review request
2020-07-09 21:12:14 +01:00
gatopeich
0eb7b0a991
Update README.md per review comments
...
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
2020-07-09 20:47:19 +01:00
Agustín F. Pozuelo
803c16e5af
Clean-up unintended changes to whitespace
2020-07-03 10:26:05 +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
cf18ba2394
Test initialization with dup keys
2020-06-23 17:50:51 +01:00
gatopeich
08963d6826
Revert types.md
2020-06-23 15:48:02 +01:00
gatopeich
d08fca2bb9
Use const Key in ordered map
...
(forgotten in previous commit!)
2020-06-23 15:44:46 +01:00
gatopeich
5e7bdf1cab
Roll-back to hard-coded object_t::value_type
2020-06-23 15:39:00 +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
acd748e16f
Use std::map default allocator as a placeholder
...
to extract the actual ObjectType::value_type
Still fails on older compilers (GCC <= 5.5)
2020-06-23 12:03:21 +01:00
gatopeich
49623a75ee
Revert "Using ordered_json instead of fifo_map in test-regression"
...
This reverts commit 5fe3d3929a
2020-06-23 11:30:52 +01:00
gatopeich
5fe3d3929a
Using ordered_json instead of fifo_map in test-regression
...
This is more comprehensive and the "my_workaround_fifo_map" wrapper does not allow to infer value type as required in this branch.
This reverts commit 064a9c9212
2020-06-22 19:10:35 +01:00
gatopeich
064a9c9212
Fix regression test
2020-06-22 18:59:19 +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
Niels Lohmann
e7452d8778
Merge branch 'release/3.8.0' into develop
2020-06-14 17:44:18 +02:00
Niels Lohmann
5f862710fe
🔖 set version to 3.8.0
2020-06-14 17:16:45 +02:00
Niels Lohmann
1ecb7884d1
👥 update contributor list
2020-06-14 15:22:08 +02:00
Niels Lohmann
c05bd90467
Merge pull request #2182 from tanuj208/develop
...
Improve parse_ubjson_fuzzer
2020-06-12 09:37:44 +02:00
Tanuj Garg
c3c5c03ea3
added fuzzing with different values to default argument in to_ubjson method
2020-06-10 20:50:25 +05:30
Niels Lohmann
27f5a6e827
🙈 ignore __pycache__ directory
2020-06-09 16:59:03 +02:00
Niels Lohmann
262d9cc67d
🚨 fix a maybe-uninitialized warning
2020-06-09 16:57:06 +02:00
Niels Lohmann
14881cf901
Merge pull request #2178 from nlohmann/input_adapter_tests
...
Add input adapter tests
2020-06-09 08:46:32 +02:00
Niels Lohmann
ae04426c85
🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532 )
2020-06-08 20:07:15 +02:00
Niels Lohmann
2cf16625ac
✅ add test for character types
2020-06-07 22:49:39 +02:00
Niels Lohmann
d4bc0c39af
✅ add test for character types
2020-06-07 22:47:54 +02:00
Niels Lohmann
6d73126ea9
🚨 fix warnings
2020-06-07 22:47:25 +02:00
Niels Lohmann
28048d8207
Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into develop
...
Conflicts:
doc/examples/swap__binary_t.link
2020-06-07 21:02:08 +02:00
Niels Lohmann
eca5490b94
📝 add example link for swap function
2020-06-07 21:01:13 +02:00
Niels Lohmann
8c1d26e186
📝 add documentation and example for accept function
2020-06-07 20:59:43 +02:00
Niels Lohmann
543dcee3a7
Merge pull request #2174 from nlohmann/fix_warnings
...
Fix warnings
2020-06-07 20:35:05 +02:00
Niels Lohmann
907803189b
🏁 fix MSVC 2015 compilation
2020-06-07 12:51:33 +02:00
Niels Lohmann
e6a7e7a16a
🚑 hotfix for #2177
2020-06-07 12:41:36 +02:00
Niels Lohmann
bf2e714e96
🚨 fix warnings
2020-06-06 14:30:17 +02:00
Niels Lohmann
7444c7fa25
Merge pull request #2145 from FrancoisChabot/1813-user-input
...
Fix Issue#1813: user defined input adapters
2020-06-05 14:30:39 +02:00
Niels Lohmann
dd7e25927f
🚨 fix warning
2020-06-05 08:27:15 +02:00
Niels Lohmann
5fe6b83c26
Merge pull request #2158 from dota17/output_adapter
...
Fix PR#1006
2020-06-05 08:25:19 +02:00
chenguoping
ad2b4ff23b
recover original blank line
2020-06-05 14:23:00 +08:00
chenguoping
0f67c5849f
undo: remove comment
2020-06-05 10:09:15 +08:00
Niels Lohmann
2df5f107a9
📝 add page on parsing and exceptions
2020-06-04 14:01:57 +02:00
Niels Lohmann
32bda1a7af
Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs
2020-06-04 13:07:20 +02:00
Niels Lohmann
9212590764
👥 update contributor list
2020-06-03 13:56:01 +02:00
Niels Lohmann
9708b1e9c3
🔥 remove Code Inspector
2020-06-03 13:49:46 +02:00
Niels Lohmann
68fd772fdf
👷 add Code Inspector via GitHub Action
2020-06-03 13:44:33 +02:00
