wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-09 16:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,255 Commits 19 Branches 57 Tags
c7282d5b1e8d30bfc0dcbca05bf8d89cdc004e63
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Niels Lohmann 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 Lohmann 393410e61a Merge pull request #1495 from njlr/patch-1 
Update Buckaroo instructions in README.md
 2019-03-10 22:03:49 +01:00
Niels Lohmann 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 Lohmann 21516f2bae Merge pull request #1491 from nickaein/patch-1 
Fix typo in README.md
 2019-02-22 09:50:45 +01:00
Niels Lohmann e326df211b Merge pull request #1474 from nickaein/develop 
Implement contains() member function
 2019-02-13 13:05:21 +01:00
Niels Lohmann c55cacee1e Merge pull request #1477 from nickaein/fix-doc 
Fix documentation
 2019-02-13 13:03:46 +01:00
Niels Lohmann 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 Lohmann 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 Lohmann 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 Lohmann de14b5ee2f Merge pull request #1455 from wythe/patch-2 
docs: README typo
 2019-01-25 13:36:07 +01:00
Niels Lohmann 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 Lohmann 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 Lohmann dffae1082f Merge pull request #1435 from pboettch/warning-fix 
🚨 fixed unused variable warning
 2019-01-15 22:18:13 +01:00
Niels Lohmann 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 Lohmann daeb48b01a Merge pull request #1411 from nickaein/develop 
Improve dump_integer performance
 2019-01-13 11:11:51 +01:00
Niels Lohmann 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 Lohmann b39f34e046 Merge pull request #1425 from hijxf/patch-1 
Updated year in README.md
 2019-01-12 10:23:31 +01:00
Niels Lohmann 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 Lohmann 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 Lohmann 975dc970d1 Merge pull request #1417 from wythe/patch-1 
docs: typo in README
 2019-01-09 20:35:49 +01:00
Niels Lohmann 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 Lohmann 85849940ba Merge pull request #1391 from pratikpc/develop 
Added Support for Structured Bindings
 2018-12-20 08:58:08 +01:00
Niels Lohmann 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 Lohmann 5d390e91ff Merge pull request #1392 from mtalliance/feature/addFileInputAdapter 
Feature/add file input adapter
 2018-12-16 22:10:03 +01:00
Niels Lohmann e73dfef6e5 Merge pull request #1382 from kjpus/patch-1 
Link to issue #958 broken
 2018-12-04 20:02:38 +01:00
Niels Lohmann 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 Lohmann 7a56f5a42b Merge pull request #1380 from manu-chroma/patch-1 
readme: fix typo
 2018-12-02 17:25:38 +01:00
Niels Lohmann 35829928da Merge pull request #1343 from mefyl/develop 
Set eofbit on exhausted input stream.
 2018-11-09 21:07:36 +01:00
Niels Lohmann f86090aafc Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig 
Allow installation via Meson
 2018-11-08 18:39:26 +01:00
Niels Lohmann 30e1cbb0df Merge pull request #1346 from ax3l/fix-mergePatchShadowParam 
Fix merge_patch shadow warning
 2018-11-08 18:38:40 +01:00
Niels Lohmann d2e6e1bf58 Merge pull request #1329 from ax3l/fix-typosWhitespaces 
Fix EOL Whitespaces & CMake Spelling
 2018-11-02 18:23:42 +01:00
Niels Lohmann 1308ea055d Merge pull request #1315 from nlohmann/feature/convert_char 
Properly convert constants to CharType
 2018-10-27 16:56:00 +02:00
Niels Lohmann 0e7be06bef Merge pull request #1323 from nlohmann/feature/enum_json_mapping 
Add macro to define enum/JSON mapping
 2018-10-27 16:55:39 +02:00
Niels Lohmann 85aaf91b85 Merge branch 'develop' into feature/enum_json_mapping 2018-10-27 16:52:59 +02:00
Niels Lohmann 5a6bdf5934 Merge branch 'develop' into feature/convert_char 2018-10-27 16:48:48 +02:00
Niels Lohmann 037e93f5c0 Merge pull request #1320 from nlohmann/julian-becker-feature/bson 
Add BSON support
 2018-10-27 16:37:54 +02:00
Niels Lohmann 7b501de054 Merge pull request #1314 from nlohmann/feature/codec_errors 
Allow to set error handler for decoding errors
 2018-10-24 08:40:58 +02:00
Niels Lohmann 9294e25c98 Merge pull request #1301 from theodelrieu/fix/1299 
add new is_constructible_* traits used in from_json
 2018-10-18 19:18:48 +02:00
Niels Lohmann b553a8a93c Merge pull request #1305 from koponomarenko/add-meson-info 
Add Meson related info to README
 2018-10-18 10:55:25 +02:00
Niels Lohmann 4b2a00641c Merge pull request #1303 from nlohmann/feature/binary_errors 
Improve diagnostic messages for binary formats
 2018-10-17 17:54:14 +02:00
Niels Lohmann dd672939a0 Merge pull request #1294 from theodelrieu/fix/json_ref_ctor 
add constraints for variadic json_ref constructors
 2018-10-12 17:35:41 +02:00
Niels Lohmann e426219256 Merge pull request #1282 from nlohmann/feature/lines_columns 
Improve diagnostic messages
 2018-10-08 22:17:33 +02:00
Niels Lohmann adfa961ed0 Merge pull request #1280 from nlohmann/feature/linter 
Removed linter warnings
 2018-10-08 21:05:33 +02:00
Niels Lohmann ac38e95780 Merge pull request #1277 from performous/fix-clang-detection 
Thirdparty benchmark: Fix Clang detection.
 2018-10-06 16:29:26 +02:00
Niels Lohmann 5c7d27c338 Merge pull request #1272 from antonioborondo/fix_warning 
Fix warning C4127: conditional expression is constant
 2018-10-04 20:33:26 +02:00
Niels Lohmann 9f18e17063 Merge pull request #1270 from chuckatkins/add-more-cmake-docs 
docs: Add additional CMake documentation
 2018-10-03 10:11:27 +02:00
Niels Lohmann 53ec0a16f3 Merge pull request #1271 from chuckatkins/cleanup-deprecated-warnings 
Turn off additional deprecation warnings for GCC.
 2018-10-02 22:07:18 +02:00
Niels Lohmann c8231eff75 Merge pull request #1260 from chuckatkins/fix-cmake-target-alias 
Fix broken cmake imported target alias
 2018-10-01 17:44:50 +02:00
Niels Lohmann 910a895027 Merge pull request #1238 from theodelrieu/fix/1237 
Fix issue #1237
 2018-09-29 14:50:54 +02:00
Niels Lohmann 1fae82b7a7 Merge branch 'develop' into fix/1237 2018-09-29 14:50:36 +02:00
Niels Lohmann d26f39466e Merge pull request #1231 from theodelrieu/feature/get_with_parameter 
Add a get overload taking a parameter.
 2018-09-29 14:30:04 +02:00
Niels Lohmann 95432c34f9 Merge pull request #1262 from knilch0r/patch-1 
unit-testsuites.cpp: fix hangup if file not found
 2018-09-29 10:58:10 +02:00
Niels Lohmann 680a4ab672 Merge pull request #1257 from henryiii/gcc48 
GCC 48
 2018-09-28 10:05:17 +02:00
Niels Lohmann e184b6ecf2 Merge pull request #1252 from koponomarenko/fix-meson-build 
Add version and license to meson.build
 2018-09-22 14:49:03 +02:00
Niels Lohmann 88b055c2df Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround 
#1179 Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crash…
 2018-09-22 14:14:56 +02:00
Niels Lohmann e4bc98d036 Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility 
Use a version check to provide backwards comatible CMake imported target names
 2018-09-19 20:46:51 +02:00
Niels Lohmann 7fa3b8865c Merge pull request #1221 from rivertam/better-error-305 
Better error 305
 2018-09-18 12:49:07 +02:00
Niels Lohmann 186c747a19 Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix 
Move lambda out of unevaluated context
 2018-09-10 20:52:11 +02:00
Niels Lohmann d3428b35c5 Merge pull request #1228 from theodelrieu/remove_static_asserts 
Remove static asserts
 2018-09-09 18:12:43 +02:00
Niels Lohmann d713727f22 Merge pull request #1202 from dennisfischer/develop 
Export package to allow builds without installing
 2018-08-25 10:56:30 +02:00
Niels Lohmann 04597c3a66 Merge pull request #1214 from devsisters/fix-1213 
Fix #1213
 2018-08-24 17:54:28 +02:00
Niels Lohmann f78ac4fbd3 Merge pull request #1200 from thyu/develop 
Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax
 2018-08-18 08:14:04 +02:00
Niels Lohmann d5b21b051c Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax 
Refactor/no virtual sax
 2018-08-16 17:47:55 +02:00
Niels Lohmann 0e748f2f8c Merge pull request #1187 from devsisters/json-internal-catch 
[RFC] Introduce a new macro function: JSON_INTERNAL_CATCH
 2018-08-14 21:56:29 +02:00
Niels Lohmann 861ee400cc Merge pull request #1176 from grembo/develop 
Fix unit tests that were silently skipped or crashed (depending on the compiler)
 2018-08-14 21:48:49 +02:00
Niels Lohmann d456a2d777 Merge pull request #1151 from sonulohani/bigObjFix 
Fixed compiler error in VS 2015 for debug mode
 2018-06-29 09:03:43 +02:00
Niels Lohmann 86a96b059d Merge pull request #1134 from Daniel599/feature/items_iterator 
fixed compile error for #1045
 2018-06-28 21:21:17 +02:00
Niels Lohmann bab5826504 Merge pull request #1144 from jrakow/cppreference-link-fix 
Fix links to cppreference named requirements (formerly concepts)
 2018-06-26 07:58:45 +02:00
Niels Lohmann 515cfc2d89 Merge pull request #1142 from jrakow/develop 
meson: fix include directory
 2018-06-24 23:33:30 +02:00
Niels Lohmann bf348ca8a4 Merge pull request #1028 from gracicot/develop 
Added support for string_view in C++17
 2018-06-23 17:10:04 +02:00
Niels Lohmann 1c81e9f5ae Merge pull request #1130 from agrianius/develop 
test (non)equality for alt_string implementation
 2018-06-18 22:01:53 +02:00
Niels Lohmann d505ed7b31 Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion 
Feature/unordered map conversion
 2018-06-18 21:59:46 +02:00
Niels Lohmann e830bc502f Merge pull request #1117 from TinyTinni/develop 
remove stringstream dependency
 2018-06-01 08:05:45 +02:00
Niels Lohmann 0efaf891e5 Merge pull request #1089 from theodelrieu/feature/map_conversion 
Provide a from_json overload for std::map
 2018-05-28 14:53:23 +02:00
Niels Lohmann 567fe9b7a0 Merge pull request #1078 from martin-mfg/patch-1 
fix typo in README
 2018-05-04 17:04:35 +02:00
Niels Lohmann 5da596385b Update issue templates 2018-05-03 18:35:56 +02:00
Niels Lohmann 14f01e1981 🔧 update issue templates 2018-05-03 18:32:53 +02:00
Niels Lohmann 0ab8fab338 Merge pull request #1058 from dns13/patch-1 
Fix typo
 2018-04-17 23:26:00 +05:30
Niels Lohmann b8bfd1140d Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements 
Misc cmake packaging enhancements
 2018-04-10 17:57:21 +02:00
Niels Lohmann 29362c6ace Merge pull request #1047 from jammehcow/patch-1 
Fixed incorrect LLVM version number in README
 2018-04-10 08:39:58 +02:00
Niels Lohmann 7c503c64b7 Merge pull request #1043 from coryan/patch-1 
Fix trivial typo in comment.
 2018-04-09 08:19:56 +02:00
Niels Lohmann acf10d9af7 Merge pull request #1041 from ax3l/topic-spack 
Package Manager: Spack
 2018-04-08 11:32:35 +02:00
Niels Lohmann 83b143382e Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin 
CMake: 3.8+ is Sufficient
 2018-04-07 15:14:59 +02:00
Niels Lohmann 495436a5d5 Merge pull request #1026 from ktonon/develop 
Added public target_compile_features for auto and constexpr
 2018-04-03 17:34:42 +02:00
Niels Lohmann 919d1fef8f Merge pull request #1009 from nlohmann/user_string_parser 
Allowing for user-defined string type in lexer/parser
 2018-03-13 14:52:59 +01:00
Niels Lohmann 0cab3b2c8e Merge pull request #1006 from agrianius/dump-template 
dump to alternative string type, as defined in basic_json template
 2018-03-12 18:41:59 +01:00