mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-21 12:05:30 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4,022 Commits 14 Branches 56 Tags 280 MiB
823801879a
Commit Graph

4022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann
3a80823ff8
🔀 merge develop branch and resolve conflicts 2020-07-11 13:21:13 +02:00
Niels Lohmann
9c21285133
Merge branch 'develop' of https://github.com/nlohmann/json into issue2179 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-11 13:20:16 +02:00
Niels Lohmann
5f146cb853
Merge pull request #2206 from gatopeich/issue2179 
Simple ordered_json that works on all supported compilers
 2020-07-11 13:15:40 +02:00
gatopeich
47d154dd49
Remove redundant comment 2020-07-11 00:34:12 +01:00
gatopeich
f9a1fec272
Remove redundant comment 2020-07-11 00:34:02 +01:00
Niels Lohmann
cbafed3494
⬇️ require CMake 3.1 2020-07-10 12:53:48 +02:00
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
Niels Lohmann
75d5d05993
Merge pull request #2253 from ericonr/pkgconf 
Add pkg-config file
 2020-07-09 20:42:42 +02:00
Niels Lohmann
4c7bd014d9
Merge pull request #2242 from nlohmann/issue2239 
Make assert configurable via JSON_ASSERT
 2020-07-09 15:13:12 +02:00
Niels Lohmann
d740622f96
📝 add documentation for macros 2020-07-09 13:23:33 +02:00
Érico Rolim
251fce819c README: add explanation on how to use pkg-config. 2020-07-09 03:59:53 -03:00
Palmer Dabbelt
c7d18c1625 cmake: Generate and install a pkg-config file. 
The meson builds install a pkg-config file, but the cmake builds don't.
This adds a pkg-config file to the cmake builds that is functionally
equivalent to the one generated from meson.
 2020-07-09 03:59:53 -03:00
Niels Lohmann
0306525cdb
Merge pull request #2251 from nlohmann/fix_2181 
Fix regression from #2181
 2020-07-09 07:33:03 +02:00
Niels Lohmann
f774a32d2b
✅ fix test 2020-07-08 14:47:22 +02:00
Niels Lohmann
e3e9ccfc02
🚑 fix regression from #2181 2020-07-08 14:02:28 +02:00
Niels Lohmann
1b04092c5c
✅ fix test 2020-07-08 12:38:46 +02:00
Niels Lohmann
d019ddfcdb
👷 add code scanning 2020-07-08 12:25:53 +02:00
Matthew Bauer
dd08f7705f Add simple test for cbor byte 2020-07-06 18:06:10 -04:00
Niels Lohmann
28ef87370b
🚨 fix warning 2020-07-06 13:19:06 +02:00
Niels Lohmann
99fc6b16ab
Merge branch 'develop' of https://github.com/nlohmann/json into issue2239 2020-07-06 12:52:59 +02:00
Niels Lohmann
ba8174041e
✅ add test case for JSON_ASSERT 2020-07-06 12:52:48 +02:00
Niels Lohmann
efcc826ecb
🚨 fix warning 2020-07-06 12:37:39 +02:00
Niels Lohmann
98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x) 2020-07-06 12:22:31 +02:00
Niels Lohmann
b04dc055b2
Merge pull request #2233 from nlohmann/issue2175 
Add specialization of get_to
 2020-07-06 07:58:52 +02:00
Niels Lohmann
197c3d4fb0
Merge pull request #2232 from nlohmann/ignore_documentation 
Refine documentation of error_handler parameter
 2020-07-06 07:58:28 +02: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
Matthew Bauer
e54f03f73b Tag binary values in cbor if set 
CBOR has tags, which work similarly to "subtype"s:

https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml

Unsure if this makes sense. Note that the subtype must just be one
byte wide.
 2020-07-02 17:40:02 -04:00
Niels Lohmann
f59f4a2b61
💚 fix build 2020-06-30 19:55:40 +02:00
Niels Lohmann
c7e079cc98
🚑 add specialization of get_to #2175 2020-06-30 14:26:52 +02:00
Niels Lohmann
ad6eadeb70
📝 refine documentation of error_handler parameter 2020-06-30 13:59:43 +02:00
gatopeich
49f26a0250 Have 4 template parameters for ordered_map 2020-06-29 17:32:55 +01:00
Niels Lohmann
eb7376bb13
Merge pull request #2225 from nlohmann/issue2175 
Simplify conversion from/to custom types
 2020-06-29 14:41:09 +02:00
Niels Lohmann
470f7c0c68
📝 add documentation 2020-06-29 13:43:06 +02:00
Niels Lohmann
1b4ea8f89b
Merge pull request #2224 from nlohmann/issue2221 
Remove unused typedefs
 2020-06-28 15:08:18 +02:00
Niels Lohmann
d7a2956b24
🔀 merge from develop 2020-06-27 13:16:20 +02:00
Niels Lohmann
ac3922c7aa
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows 
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/input_adapters.hpp
	include/nlohmann/detail/input/lexer.hpp
	include/nlohmann/detail/output/binary_writer.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2020-06-27 13:14:48 +02:00
Niels Lohmann
fa9f4040df
🔥 remove unused typedefs #2221 2020-06-27 13:07:02 +02:00
Niels Lohmann
5ba0f65c34
🔧 remove feature request template 2020-06-27 12:55:41 +02:00
Niels Lohmann
aefa0b3e86
🔧 use Github discussions for questions 2020-06-27 12:54:42 +02:00
Niels Lohmann
3948b5b091
Merge pull request #2212 from nlohmann/comments 
Add option to ignore comments in parse/accept functions
 2020-06-27 12:44:51 +02:00
Niels Lohmann
1af4f5f360
Merge pull request #2222 from alexreinking/patch-1 
Enable CMake policy CMP0077
 2020-06-27 12:43:52 +02:00
Niels Lohmann
c5ee222982
Merge pull request #2211 from nlohmann/fix_warnings 
Fix Clang-Tidy warnings
 2020-06-27 12:34:18 +02:00
Alex Reinking
ec43371e07
Enable CMake policy CMP0077 
Projects that import json via [FetchContent](https://cmake.org/cmake/help/latest/module/FetchContent.html) or `add_subdirectory` pointed at a git submodule may want to set `JSON_BuildTests` to "NO". However, this doesn't work without creating an identical `option()` in the importing project. Enabling CMP0077 in supported versions of CMake changes the behavior of `option()` to allow importing projects to set default values for the variables without touching the cache.

See the documentation for CMP0077 here: https://cmake.org/cmake/help/latest/policy/CMP0077.html
 2020-06-26 11:47:36 -07:00
Niels Lohmann
635b9a0ae4
Merge pull request #2193 from dota17/issue#2059 
Fix consistency in function `int_to_string()`
 2020-06-24 11:46:48 +02: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