  Niels LohmannandGitHub
|
c05bd90467
|
Merge pull request #2182 from tanuj208/develop
Improve parse_ubjson_fuzzer
|
2020-06-12 09:37:44 +02:00 |
|
|
Niels LohmannandGitHub
|
14881cf901
|
Merge pull request #2178 from nlohmann/input_adapter_tests
Add input adapter tests
|
2020-06-09 08:46:32 +02:00 |
|
|
Niels LohmannandGitHub
|
543dcee3a7
|
Merge pull request #2174 from nlohmann/fix_warnings
Fix warnings
|
2020-06-07 20:35:05 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
5fe6b83c26
|
Merge pull request #2158 from dota17/output_adapter
Fix PR#1006
|
2020-06-05 08:25:19 +02:00 |
|
|
Niels LohmannandGitHub
|
2c4be7d65c
|
Merge pull request #2152 from TotalCaesar659/patch-1
Update URLs to HTTPS
|
2020-06-03 12:31:33 +02:00 |
|
|
Niels LohmannandGitHub
|
2ad847f21b
|
🔨 fix doxygen link
|
2020-06-03 12:30:42 +02:00 |
|
|
Niels LohmannandGitHub
|
fdf5a63dfd
|
🔨 fix Doxygen link
|
2020-06-03 12:30:10 +02:00 |
|
|
Niels LohmannandGitHub
|
309acb445a
|
Merge pull request #2153 from dota17/issue#1972
Fix issue#1972
|
2020-06-03 12:26:17 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
9ec0e4c25b
|
Merge pull request #2140 from nlohmann/issue1715
Respect allow_exceptions=false for binary formats
|
2020-05-28 07:52:26 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
d70d06ae41
|
Merge pull request #2137 from dota17/MSC_VER
Fix issue 2112
|
2020-05-27 08:49:19 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
a82c80e9af
|
Merge pull request #2125 from nlohmann/binary_type
Clean up implementation of binary type
|
2020-05-20 18:58:29 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
c237aa3a68
|
Merge pull request #2119 from nlohmann/release_cleanup
Overwork CI
|
2020-05-18 09:07:36 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
f40a9f876a
|
Merge pull request #2044 from dota17/issue#1719
Fix issue#1719
|
2020-05-16 12:57:00 +02:00 |
|
|
Niels LohmannandGitHub
|
0857140839
|
Merge pull request #1950 from FrancoisChabot/issues/1457
templated input adapters
|
2020-05-14 07:52:02 +02:00 |
|
|
Niels LohmannandGitHub
|
a4266bbb7d
|
Merge branch 'develop' into issues/1457
|
2020-05-13 12:48:46 +02:00 |
|
|
Niels LohmannandGitHub
|
9265ca7a08
|
Merge pull request #2099 from nlohmann/issue2082
Add tests for binary values
|
2020-05-13 07:56:11 +02:00 |
|
|
Niels LohmannandGitHub
|
1de30bc611
|
Merge pull request #2100 from nlohmann/fix_coveralls
Fix Coveralls integration
|
2020-05-12 12:26:22 +02:00 |
|
|
Niels LohmannandGitHub
|
a50a14088c
|
Merge pull request #2081 from nlohmann/external_test_data
Use external test data
|
2020-05-04 20:58:02 +02:00 |
|
|
Niels LohmannandGitHub
|
634fa87e5a
|
Merge pull request #2080 from nlohmann/remove_doozer
Remove Doozer CI
|
2020-05-03 13:58:29 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
2251741b53
|
Merge pull request #2077 from ArthurSonzogni/develop-2
Fix README.md. Missing ```
|
2020-05-01 14:08:59 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
b27d8a3253
|
Merge pull request #2074 from ArthurSonzogni/develop
Add CMake fetchcontent documentation and tests
|
2020-05-01 12:42:29 +02:00 |
|
|
Niels LohmannandGitHub
|
db013c9428
|
Merge pull request #2071 from nlohmann/issue2067
Properly pass serialize_binary to dump function
|
2020-04-29 19:39:58 +02:00 |
|
|
Niels LohmannandGitHub
|
b1fe6ee0d1
|
Merge pull request #2069 from nlohmann/issue2064
Fix returning reference to local temporary object
|
2020-04-28 20:56:48 +02:00 |
|
|
Niels LohmannandGitHub
|
d9d1279a94
|
Merge pull request #2060 from alexandermyasnikov/develop
updated wandbox link
|
2020-04-24 09:18:23 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
a29e3b1318
|
Merge pull request #2054 from nlohmann/feature/issue1983
Fix bug in diff function
|
2020-04-20 19:44:35 +02:00 |
|
|
Niels LohmannandGitHub
|
3607687a14
|
Merge pull request #2053 from nlohmann/gcc10warnings
Fix GCC compiler warnings
|
2020-04-20 08:05:42 +02:00 |
|
|
Niels LohmannandGitHub
|
721a1a0b5d
|
Merge pull request #2051 from nlohmann/clang10warnings
Fix Clang compiler warnings
|
2020-04-20 08:04:23 +02:00 |
|
|
Niels LohmannandGitHub
|
f14a7d8af7
|
Merge pull request #2050 from nlohmann/doctest_update
Update doctest to 2.3.7
|
2020-04-20 08:02:58 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
b7be613b6e
|
Merge pull request #1990 from dota17/json_pointer
catch exceptions for json_pointer : ..../+99
|
2020-04-13 13:29:33 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
3483d923d4
|
Merge pull request #2033 from nlohmann/feature/issue1913
Replace deprecated std::is_pod
|
2020-04-13 12:32:37 +02:00 |
|
|
Niels LohmannandGitHub
|
4396a68d2d
|
Merge pull request #1984 from dota17/document-fix
Modify the document about operator==
|
2020-04-11 18:55:18 +02:00 |
|
|
Niels LohmannandGitHub
|
062fd3842c
|
Merge pull request #2004 from wsjcpp/develop
Added wsjcpp.yml
|
2020-04-11 11:48:04 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
5c00308de7
|
Merge pull request #2010 from magamig/patch-1
Update LICENSE.MIT
|
2020-04-05 21:55:47 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
54656ef279
|
Merge pull request #1956 from dota17/dota17-fix-typo
Fix typo in examples
|
2020-03-13 17:26:24 +01:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
973c52dd4a
|
Merge pull request #1923 from Coeur/typos
Some typos
|
2020-02-02 14:48:07 +01:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
ad383f66bc
|
Merge pull request #1907 from pauljurczak/patch-1
Update README.md
|
2020-01-19 22:45:53 +01:00 |
|
|
Niels LohmannandGitHub
|
ee8732c359
|
Merge pull request #1555 from theodelrieu/fix/1511
Fix/1511
|
2019-04-03 17:24:25 +02:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
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 LohmannandGitHub
|
3ac5fa31c5
|
💬 update issue templates
|
2019-03-20 01:27:37 +01:00 |
|
|
Niels LohmannandGitHub
|
9dc3552931
|
Merge pull request #1514 from naszta/macrofix
Change macros to numeric_limits
|
2019-03-15 12:46:42 +01:00 |
|
|
Niels LohmannandGitHub
|
c6fc902184
|
Merge pull request #1489 from andreas-schwab/develop
Do proper endian conversions
|
2019-03-13 11:57:58 +01:00 |
|
|
Niels LohmannandGitHub
|
d39842e68f
|
Merge pull request #1330 from ax3l/topic-installEmbed
CMake: Optional Install if Embedded
|
2019-03-13 11:13:09 +01:00 |
|
|
Niels LohmannandGitHub
|
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 LohmannandGitHub
|
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 |
|
|
Niels LohmannandGitHub
|
8eb7db7277
|
Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if
Use C++11 features supported by CMake 3.1.
|
2019-03-10 22:08:16 +01:00 |
|
|
Niels LohmannandGitHub
|
393410e61a
|
Merge pull request #1495 from njlr/patch-1
Update Buckaroo instructions in README.md
|
2019-03-10 22:03:49 +01:00 |
|
|
Niels LohmannandGitHub
|
30edcaab3a
|
Merge pull request #1496 from lieff/develop
fix GCC 7.1.1 - 7.2.1 on CentOS
|
2019-03-10 22:01:52 +01:00 |
|
|
Niels LohmannandGitHub
|
21516f2bae
|
Merge pull request #1491 from nickaein/patch-1
Fix typo in README.md
|
2019-02-22 09:50:45 +01:00 |
|
|
Niels LohmannandGitHub
|
e326df211b
|
Merge pull request #1474 from nickaein/develop
Implement contains() member function
|
2019-02-13 13:05:21 +01:00 |
|
|
Niels LohmannandGitHub
|
c55cacee1e
|
Merge pull request #1477 from nickaein/fix-doc
Fix documentation
|
2019-02-13 13:03:46 +01:00 |
|
|
Niels LohmannandGitHub
|
46ff13d39e
|
Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple
Disable Clang -Wmismatched-tags warning on tuple_size / tuple_element
|
2019-02-10 21:50:12 +01:00 |
|
|
Niels LohmannandGitHub
|
eee3bc0c79
|
Merge pull request #1464 from elvisoric/update_meson_install_step
Disable installation when used as meson subproject. #1463
|
2019-02-10 21:48:20 +01:00 |
|
|
Niels LohmannandGitHub
|
68ec3eb8d6
|
Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon
remove extra semicolon from readme
|
2019-01-25 13:36:18 +01:00 |
|
|
Niels LohmannandGitHub
|
de14b5ee2f
|
Merge pull request #1455 from wythe/patch-2
docs: README typo
|
2019-01-25 13:36:07 +01:00 |
|
|
Niels LohmannandGitHub
|
e17e0d031f
|
Merge pull request #1446 from scinart/develop
attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case.
|
2019-01-20 12:18:02 +01:00 |
|
|
Niels LohmannandGitHub
|
b9a39b38bf
|
Merge pull request #1434 from pboettch/develop
allow push_back() and pop_back() calls on json_pointer
|
2019-01-19 17:07:36 +01:00 |
|
|
Niels LohmannandGitHub
|
dffae1082f
|
Merge pull request #1435 from pboettch/warning-fix
🚨 fixed unused variable warning
|
2019-01-15 22:18:13 +01:00 |
|
|
Niels LohmannandGitHub
|
851fe8a5ef
|
Merge pull request #1430 from nicoddemus/conda-docs
Add instructions about using nlohmann/json with the conda package manager
|
2019-01-15 22:16:49 +01:00 |
|
|
Niels LohmannandGitHub
|
daeb48b01a
|
Merge pull request #1411 from nickaein/develop
Improve dump_integer performance
|
2019-01-13 11:11:51 +01:00 |
|
|
Niels LohmannandGitHub
|
29a03f465e
|
Merge pull request #1414 from nickaein/mydevel-appveyor-x64
Fix x64 target platform for appveyor
|
2019-01-12 23:09:19 +01:00 |
|
|
Niels LohmannandGitHub
|
b39f34e046
|
Merge pull request #1425 from hijxf/patch-1
Updated year in README.md
|
2019-01-12 10:23:31 +01:00 |
|
|
Niels LohmannandGitHub
|
df460c96cf
|
Merge pull request #1423 from skypjack/patch-1
Fixed broken links in the README file
|
2019-01-10 13:52:52 +01:00 |
|
|
Niels LohmannandGitHub
|
847dd2a954
|
Merge pull request #1420 from skypjack/patch-1
Fixed broken links in the README file
|
2019-01-09 22:33:40 +01:00 |
|
|
Niels LohmannandGitHub
|
975dc970d1
|
Merge pull request #1417 from wythe/patch-1
docs: typo in README
|
2019-01-09 20:35:49 +01:00 |
|
|
Niels LohmannandGitHub
|
676c847c55
|
Merge pull request #1409 from yann-morin-1998/yem/cmake-version
buildsystem: relax requirement on cmake version
|
2019-01-01 17:17:38 +01:00 |
|
|
Niels LohmannandGitHub
|
85849940ba
|
Merge pull request #1391 from pratikpc/develop
Added Support for Structured Bindings
|
2018-12-20 08:58:08 +01:00 |
|
|
Niels LohmannandGitHub
|
4f270e38cc
|
Merge pull request #1342 from davedissian/bugfix/sfinae-iterator-traits
Add a SFINAE friendly iterator_traits and use that instead.
|
2018-12-19 08:24:18 +01:00 |
|
|
Niels LohmannandGitHub
|
5d390e91ff
|
Merge pull request #1392 from mtalliance/feature/addFileInputAdapter
Feature/add file input adapter
|
2018-12-16 22:10:03 +01:00 |
|
|
Niels LohmannandGitHub
|
e73dfef6e5
|
Merge pull request #1382 from kjpus/patch-1
Link to issue #958 broken
|
2018-12-04 20:02:38 +01:00 |
|
|
Niels LohmannandGitHub
|
d53873a251
|
Merge pull request #1363 from theodelrieu/doc/implicit_conversions
recommend using explicit from JSON conversions
|
2018-12-02 17:27:46 +01:00 |
|
|
Niels LohmannandGitHub
|
7a56f5a42b
|
Merge pull request #1380 from manu-chroma/patch-1
readme: fix typo
|
2018-12-02 17:25:38 +01:00 |
|
|
Niels LohmannandGitHub
|
35829928da
|
Merge pull request #1343 from mefyl/develop
Set eofbit on exhausted input stream.
|
2018-11-09 21:07:36 +01:00 |
|
|
Niels LohmannandGitHub
|
f86090aafc
|
Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig
Allow installation via Meson
|
2018-11-08 18:39:26 +01:00 |
|