starred/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-25 14:20:14 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity
3,892 Commits 36 Branches 57 Tags
5026acd70c96ef45ad248ef2362a8172de5d1d63
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann 5026acd70c Merge pull request #2444 from linev/fix_gcc48_warn 
Change argument name "subtype" in byte_container_with_subtype
 2020-12-11 13:46:41 +01:00
Niels Lohmann 3ad6992f50 Merge pull request #2405 from karzhenkov/fix-json_ref-move 
Fix move constructor of json_ref
 2020-12-11 13:36:33 +01:00
Niels Lohmann e3643aadf7 Merge pull request #2447 from jbzdarkid/develop 
Add asserts to suppress C28020
 2020-12-11 13:27:52 +01:00
Niels Lohmann d9e2b191ad Merge pull request #2512 from YarikTH/issue2490 
Ranged insert test section is added in unit-ordered_json.cpp
 2020-12-11 13:21:33 +01:00
Niels Lohmann 6030a11051 Merge pull request #2367 from nlohmann/hedley14 
Update Hedley
 2020-08-26 08:13:43 +02:00
Niels Lohmann b9d76516a2 Merge pull request #2363 from nlohmann/issue2360 
Fix and extend documentation of discarded values
 2020-08-20 11:38:43 +02:00
Niels Lohmann 772f37c12d Merge pull request #2354 from rbuch/develop 
Fix typos in documentation
 2020-08-14 06:04:56 +02:00
Niels Lohmann 8d0aa09ab5 Merge pull request #2352 from nlohmann/private_macro 
Remove "#define private public" from tests
 2020-08-13 10:06:59 +02:00
Niels Lohmann b888afe5f4 Merge pull request #2349 from nlohmann/issue2348 
Remove -Wimplicit-fallthrough warning
 2020-08-11 09:05:02 +02:00
Niels Lohmann 37ce871eeb Merge pull request #2347 from nlohmann/no_exceptions 
Fix code to work without exceptions
 2020-08-10 22:47:27 +02:00
Niels Lohmann e030d26089 Merge pull request #2344 from ongjunjie/fix-cmake-overwrite-compiler 
fix cmake script overwriting compiler path
 2020-08-08 12:15:10 +02:00
Niels Lohmann f4155e4727 Merge pull request #2333 from nlohmann/fallthrough 
Fix fallthrough warning
 2020-08-01 15:32:21 +02:00
Niels Lohmann 8a54617240 Merge pull request #2332 from nlohmann/issue2330 
Fix lexer to properly cope with repeated comments
 2020-08-01 12:29:33 +02:00
Niels Lohmann 1da931730a Merge pull request #2327 from nlohmann/issue2326 
Fix name of Homebrew formula in documentation
 2020-07-31 08:00:08 +02:00
Niels Lohmann 1eedee5e4e Merge pull request #2319 from nlohmann/issue2315 
Fix a bug due to missing overloads in ordered_map container
 2020-07-31 07:59:18 +02:00
Niels Lohmann 35daa5c00b Merge pull request #2320 from wx257osn2/fix-typo 
fix typo
 2020-07-30 12:27:16 +02:00
Niels Lohmann 1b8efed06f Merge pull request #2318 from eli-schwartz/installfix 
cmake: install pkg-config file relative to current_binary_dir
 2020-07-28 13:25:04 +02:00
Niels Lohmann 7d01a9e875 Merge branch 'develop' into installfix 2020-07-28 13:24:54 +02:00
Niels Lohmann b3da8b325a Merge pull request #2314 from xvitaly/fix-path 
Fixed installation of pkg-config file on other than Ubuntu
 2020-07-28 13:24:08 +02:00
Niels Lohmann 67ed63b196 Merge pull request #2312 from nlohmann/docs 
Update documentation
 2020-07-26 10:06:01 +02:00
Niels Lohmann 808aca41aa Merge pull request #2305 from AODQ/develop 
fixes unused variable 'ex' for #2304
 2020-07-25 21:51:54 +02:00
Niels Lohmann 63e7c40e35 Merge pull request #2297 from nlohmann/issue2286 
Add support for high-precision numbers in UBJSON encoding
 2020-07-25 21:50:53 +02:00
Niels Lohmann 40b78d3847 Merge pull request #2308 from nlohmann/cbor_tags 
Fix bug in CBOR tag handling
 2020-07-25 19:43:11 +02:00
Niels Lohmann a1dbfcd736 Merge pull request #2306 from jwittbrodt/develop 
added inline to NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE macro
 2020-07-25 10:52:56 +02:00
Niels Lohmann c00c3162b2 Merge branch 'develop' into develop 2020-07-25 10:52:42 +02:00
Niels Lohmann 448ceb2e12 Merge pull request #2303 from nlohmann/cleanup 
Cleanup
 2020-07-25 05:41:51 +02:00
Niels Lohmann 43e07bb92d Merge pull request #2301 from nlohmann/regression2281 
Add test with multiple translation units
 2020-07-23 13:14:24 +02:00
Niels Lohmann a048b72fe1 Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator 
Feat/explicit conversion operator
 2020-07-23 08:52:51 +02:00
Niels Lohmann 484029b51c Merge pull request #2299 from nlohmann/fix_warnings 
Fix unused parameter
 2020-07-22 18:43:33 +02:00
Niels Lohmann 2cd10a7405 Merge pull request #2300 from nlohmann/gihub_actions 
Merge Gitlab actions
 2020-07-22 09:45:55 +02:00
Niels Lohmann 8344857764 Merge pull request #2287 from pfeatherstone/develop 
Serialisation macros: increase upper bound on number of member variables
 2020-07-20 21:35:55 +02:00
Niels Lohmann 893eda8353 Merge pull request #2294 from jprochazk/develop 
fix eof for get_binary and get_string
 2020-07-20 08:02:03 +02:00
Niels Lohmann b1da58b76b Merge pull request #2282 from nlohmann/missing_sax_check 
Add static assertion for missing binary function in SAX interface
 2020-07-19 18:09:08 +02:00
Niels Lohmann 1fd6c5882a Merge pull request #2285 from T0b1-iOS/develop 
add inline specifier for detail::combine
 2020-07-19 17:55:51 +02:00
Niels Lohmann 43ab8a2357 Merge pull request #2279 from nlohmann/issue1818 
Add test for target_include_directories
 2020-07-18 06:12:57 +02:00
Niels Lohmann a10d486e36 Merge pull request #2244 from matthewbauer/tag-cbor 
Tag binary values in cbor if set
 2020-07-17 14:05:48 +02:00
Niels Lohmann e65cc9dccb Merge pull request #2274 from nlohmann/analyzers 
Clean up maintainer Makefiles and fix some linter warnings
 2020-07-17 14:01:19 +02:00
Niels Lohmann 548e7e54c9 Merge pull request #2273 from nlohmann/issue1968 
Add option to ignore CBOR tags
 2020-07-17 13:59:55 +02:00
Niels Lohmann 6023a7ccd9 Merge branch 'develop' into analyzers 2020-07-17 13:59:32 +02:00
Niels Lohmann 270f1ae482 Merge pull request #2269 from nlohmann/hash 
Hash function without allocation
 2020-07-17 13:57:47 +02:00
Niels Lohmann 23c97f4aa5 Merge pull request #2268 from t-b/feature/add-clang-cl 
Add ClangCL for MSVC
 2020-07-16 07:40:58 +02:00
Niels Lohmann 1a521cbd36 Merge pull request #2264 from t-b/feature/use-proper-SED-in-makefile 
Makefile: Always use SED variable
 2020-07-14 14:07:33 +02:00
Niels Lohmann 8921e5e5db Merge pull request #2262 from nlohmann/more_ci 
Add Xcode 12 CI
 2020-07-13 21:04:57 +02:00
Niels Lohmann e316f5c5b6 Merge pull request #2258 from nlohmann/issue2179 
Add ordered_json specialization with ordered object keys
 2020-07-12 13:11:23 +02:00
Niels Lohmann 486812904f Merge pull request #2259 from nlohmann/clang_windows 
Make library work with Clang on Windows
 2020-07-12 13:09:35 +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
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 0306525cdb Merge pull request #2251 from nlohmann/fix_2181 
Fix regression from #2181
 2020-07-09 07:33:03 +02:00
Niels Lohmann d019ddfcdb 👷 add code scanning 2020-07-08 12:25:53 +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
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 1b4ea8f89b Merge pull request #2224 from nlohmann/issue2221 
Remove unused typedefs
 2020-06-28 15:08:18 +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
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
Niels Lohmann 8575fdf9ad Merge pull request #2181 from dota17/issue#1275 
Fix issue#1275
 2020-06-23 09:23:03 +02:00
Niels Lohmann 4bfe4add20 Merge pull request #2203 from t-b/use-unsigned-indizies-for-array-index-in-json-pointer 
Use unsigned indizies for array index in json pointer
 2020-06-23 09:16:01 +02:00
Niels Lohmann 29ad2178c6 Merge pull request #2176 from gracicot/cpp20-support-no-std-fct-templ-specialization 
C++20 support by removing swap specialization
 2020-06-21 20:39:58 +02:00
Niels Lohmann 8dade80499 Merge pull request #2202 from nlohmann/issue2189 
Add option to not rely on Internet connectivity during test stage
 2020-06-21 08:41:48 +02:00
Niels Lohmann 74c6e4295f Merge pull request #2201 from nlohmann/issue2196 
Serialize floating-point numbers with 32 bit when possible (MessagePack)
 2020-06-20 09:31:02 +02:00
Niels Lohmann c05bd90467 Merge pull request #2182 from tanuj208/develop 
Improve parse_ubjson_fuzzer
 2020-06-12 09:37:44 +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 543dcee3a7 Merge pull request #2174 from nlohmann/fix_warnings 
Fix warnings
 2020-06-07 20:35:05 +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 5fe6b83c26 Merge pull request #2158 from dota17/output_adapter 
Fix PR#1006
 2020-06-05 08:25:19 +02:00
Niels Lohmann 2c4be7d65c Merge pull request #2152 from TotalCaesar659/patch-1 
Update URLs to HTTPS
 2020-06-03 12:31:33 +02:00
Niels Lohmann 2ad847f21b 🔨 fix doxygen link 2020-06-03 12:30:42 +02:00
Niels Lohmann fdf5a63dfd 🔨 fix Doxygen link 2020-06-03 12:30:10 +02:00
Niels Lohmann 309acb445a Merge pull request #2153 from dota17/issue#1972 
Fix issue#1972
 2020-06-03 12:26:17 +02:00
Niels Lohmann 61832afe15 Merge pull request #2144 from XyFreak/gcc10_type_limits 
Fix issue#1939: Cast character to unsigned for comparison
 2020-05-28 12:59:57 +02:00
Niels Lohmann 9ec0e4c25b Merge pull request #2140 from nlohmann/issue1715 
Respect allow_exceptions=false for binary formats
 2020-05-28 07:52:26 +02:00
Niels Lohmann a01759af0f Merge pull request #2143 from quentin-dev/develop 
Fix issue#2142: readme: fix typo in CMake FetchContent example
 2020-05-28 07:50:27 +02:00
Niels Lohmann d70d06ae41 Merge pull request #2137 from dota17/MSC_VER 
Fix issue 2112
 2020-05-27 08:49:19 +02:00
Niels Lohmann 3c60a66c4c Merge pull request #2104 from dota17/issue#2086 
Fix issue#2086: disallow json::value_t type parameter in value()
 2020-05-26 13:15:06 +02:00
Niels Lohmann 25aab7ee41 Merge pull request #2136 from aokellermann/CircleCI_GCC_BleedingEdge 
Add bleeding edge GCC to CI
 2020-05-26 12:39:42 +02:00
Niels Lohmann a82c80e9af Merge pull request #2125 from nlohmann/binary_type 
Clean up implementation of binary type
 2020-05-20 18:58:29 +02:00
Niels Lohmann a861bdb81f Merge pull request #2121 from gistrec/fix_compilation_error_msvc 
Fixed a compilation error in MSVC
 2020-05-19 13:55:37 +02:00
Niels Lohmann c237aa3a68 Merge pull request #2119 from nlohmann/release_cleanup 
Overwork CI
 2020-05-18 09:07:36 +02:00
Niels Lohmann 3799b3f8dd Merge pull request #2116 from nlohmann/issue2113 
Fix warnings from Clang 10 and GCC 9
 2020-05-17 12:19:06 +02:00
Niels Lohmann 6154d50a9f Merge pull request #2115 from nlohmann/issue2089 
Do not include <ciso646> when using C++17
 2020-05-17 12:17:17 +02:00
Niels Lohmann f40a9f876a Merge pull request #2044 from dota17/issue#1719 
Fix issue#1719
 2020-05-16 12:57:00 +02:00
Niels Lohmann 0857140839 Merge pull request #1950 from FrancoisChabot/issues/1457 
templated input adapters
 2020-05-14 07:52:02 +02:00
Niels Lohmann a4266bbb7d Merge branch 'develop' into issues/1457 2020-05-13 12:48:46 +02:00
Niels Lohmann 9265ca7a08 Merge pull request #2099 from nlohmann/issue2082 
Add tests for binary values
 2020-05-13 07:56:11 +02:00
Niels Lohmann 1de30bc611 Merge pull request #2100 from nlohmann/fix_coveralls 
Fix Coveralls integration
 2020-05-12 12:26:22 +02:00
Niels Lohmann a50a14088c Merge pull request #2081 from nlohmann/external_test_data 
Use external test data
 2020-05-04 20:58:02 +02:00
Niels Lohmann 634fa87e5a Merge pull request #2080 from nlohmann/remove_doozer 
Remove Doozer CI
 2020-05-03 13:58:29 +02:00
Niels Lohmann f0050c9ba0 Merge pull request #2019 from dota17/contains_v2 
fix #1982:json_pointer.contains() exception is incorrectly raised
 2020-05-02 11:04:57 +02:00
Niels Lohmann 2251741b53 Merge pull request #2077 from ArthurSonzogni/develop-2 
Fix README.md. Missing ```
 2020-05-01 14:08:59 +02:00
Niels Lohmann c9f404dc98 Merge pull request #2076 from rmisev/patch-1 
Fix error message about invalid surrogate pairs
 2020-05-01 12:47:39 +02:00
Niels Lohmann b27d8a3253 Merge pull request #2074 from ArthurSonzogni/develop 
Add CMake fetchcontent documentation and tests
 2020-05-01 12:42:29 +02:00
Niels Lohmann db013c9428 Merge pull request #2071 from nlohmann/issue2067 
Properly pass serialize_binary to dump function
 2020-04-29 19:39:58 +02:00
Niels Lohmann b1fe6ee0d1 Merge pull request #2069 from nlohmann/issue2064 
Fix returning reference to local temporary object
 2020-04-28 20:56:48 +02:00
Niels Lohmann d9d1279a94 Merge pull request #2060 from alexandermyasnikov/develop 
updated wandbox link
 2020-04-24 09:18:23 +02:00
Niels Lohmann 63afc8e3f8 Merge pull request #2043 from dota17/unit-constructor1 
Add missing testcase about NaN in unit-constructor1.cpp
 2020-04-21 07:35:44 +02:00
Niels Lohmann a29e3b1318 Merge pull request #2054 from nlohmann/feature/issue1983 
Fix bug in diff function
 2020-04-20 19:44:35 +02:00
Niels Lohmann 3607687a14 Merge pull request #2053 from nlohmann/gcc10warnings 
Fix GCC compiler warnings
 2020-04-20 08:05:42 +02:00