amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-28 16:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,713 Commits 17 Branches 57 Tags
a3a9d5665e1663b52d026dc475c84b97973aae8a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Niels Lohmann 721a1a0b5d Merge pull request #2051 from nlohmann/clang10warnings 
Fix Clang compiler warnings
 2020-04-20 08:04:23 +02:00
Niels Lohmann f14a7d8af7 Merge pull request #2050 from nlohmann/doctest_update 
Update doctest to 2.3.7
 2020-04-20 08:02:58 +02:00
Niels Lohmann be137609df Merge pull request #1746 from uhoreg/cmake_arch_indep 
make CMake's version config file architecture-independent
 2020-04-19 10:09:28 +02:00
Niels Lohmann 3bc9e053c9 Merge pull request #1969 from dota17/dota17-warning 
fix warnings in serializer.hpp for VS2019
 2020-04-17 10:10:38 +02:00
Niels Lohmann 69ac336042 Merge pull request #1967 from dota17/dota17-disable 
Fix C26451 warnnings in to_chars.hpp
 2020-04-17 10:08:21 +02:00
Niels Lohmann f2b43a36b2 Merge pull request #1662 from OmnipotentEntity/develop 
Add binary type support to all binary file formats, as well as an internally represented binary type
 2020-04-16 11:14:32 +02:00
Niels Lohmann b7be613b6e Merge pull request #1990 from dota17/json_pointer 
catch exceptions for json_pointer : ..../+99
 2020-04-13 13:29:33 +02:00
Niels Lohmann 84f19d6333 Merge pull request #2034 from ArtemSarmini/gh-1920-gcc-10-incomplete-types 
Templatize basic_json constructor from json_ref
 2020-04-13 13:19:28 +02:00
Niels Lohmann 3483d923d4 Merge pull request #2033 from nlohmann/feature/issue1913 
Replace deprecated std::is_pod
 2020-04-13 12:32:37 +02:00
Niels Lohmann 4396a68d2d Merge pull request #1984 from dota17/document-fix 
Modify the document about operator==
 2020-04-11 18:55:18 +02:00
Niels Lohmann 062fd3842c Merge pull request #2004 from wsjcpp/develop 
Added wsjcpp.yml
 2020-04-11 11:48:04 +02:00
Niels Lohmann ea0a7c7b4f Merge pull request #2025 from ArtemSarmini/issue-1971-basic_json-push_back 
Fixes #1971 (memory leak in basic_json::push_back)
 2020-04-10 13:19:14 +02:00
Niels Lohmann 299feb13e7 Merge pull request #1958 from t-b/add-zc-flag-for-msvc 
appveyor.yml: Compile and test with latest version for __cplusplus ma…
 2020-04-10 13:12:34 +02:00
Niels Lohmann 3884d33c60 Merge pull request #1980 from linev/fix_warning 
Rename argument array_index to array_indx in json_pointer methods
 2020-04-05 22:00:41 +02:00
Niels Lohmann 554e8c7356 Merge pull request #2002 from alexandermyasnikov/develop 
fix error 'setw' is not a member of 'std' in Wandbox example
 2020-04-05 21:58:21 +02:00
Niels Lohmann 5c00308de7 Merge pull request #2010 from magamig/patch-1 
Update LICENSE.MIT
 2020-04-05 21:55:47 +02:00
Niels Lohmann 83e36f314f Merge pull request #2008 from garethsb-sony/implicit-cast-vs2019 
PR for #2006 to test in AppVeyor.
 2020-04-05 21:53:47 +02:00
Niels Lohmann 19843b038c Merge pull request #1933 from dota17/dota17-FAQ 
Update README.md : add a FAQ about memory release
 2020-03-19 11:25:47 +01:00
Niels Lohmann 54656ef279 Merge pull request #1956 from dota17/dota17-fix-typo 
Fix typo in examples
 2020-03-13 17:26:24 +01:00
Niels Lohmann d102da61ad Merge pull request #1979 from alex-weej/patch-2 
README: Fix string representation of `dump`ed `json`
 2020-03-13 16:49:13 +01:00
Niels Lohmann 973c52dd4a Merge pull request #1923 from Coeur/typos 
Some typos
 2020-02-02 14:48:07 +01:00
Niels Lohmann 6a6790ab68 Merge pull request #1917 from jothepro/update-links-to-hunter 
Readme: Updated links to hunter repo & docs
 2020-01-31 11:47:42 +01:00
Niels Lohmann 3eb6b0e7a2 Merge pull request #1918 from kastiglione/patch-1 
Fix link to parse function in README
 2020-01-31 11:46:53 +01:00
Niels Lohmann 6ca5338a0c Merge pull request #1909 from Klaim/patch-1 
Adds instruction for using Build2's package manager
 2020-01-28 19:00:45 +01:00
Niels Lohmann ad383f66bc Merge pull request #1907 from pauljurczak/patch-1 
Update README.md
 2020-01-19 22:45:53 +01:00
Niels Lohmann ee8732c359 Merge pull request #1555 from theodelrieu/fix/1511 
Fix/1511
 2019-04-03 17:24:25 +02:00
Niels Lohmann d1ef75316e Merge pull request #1439 from onqtam/doctest 
moved from Catch to doctest for unit tests
 2019-04-03 17:01:48 +02:00
Niels Lohmann b52c3638f5 Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang 
Remove C++17 extension warning from clang; #1535
 2019-03-29 09:14:25 +01:00
Niels Lohmann 3ac5fa31c5 💬 update issue templates 2019-03-20 01:27:37 +01:00
Niels Lohmann 9dc3552931 Merge pull request #1514 from naszta/macrofix 
Change macros to numeric_limits
 2019-03-15 12:46:42 +01:00
Niels Lohmann c6fc902184 Merge pull request #1489 from andreas-schwab/develop 
Do proper endian conversions
 2019-03-13 11:57:58 +01:00
Niels Lohmann d39842e68f Merge pull request #1330 from ax3l/topic-installEmbed 
CMake: Optional Install if Embedded
 2019-03-13 11:13:09 +01:00
Niels Lohmann c983b67112 Merge pull request #1469 from garethsb-sony/json_pointer-append 
Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers
 2019-03-11 22:47:08 +01:00
Niels Lohmann cabe2357b8 Merge pull request #1492 from stac47/fix_gcc9_allocator 
Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)
 2019-03-11 15:21:54 +01:00