wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-14 19:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,813 Commits 20 Branches 57 Tags
24946f67f1b70ff1b00a04a62246dbc2fd402c5f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Niels Lohmann e737de8941 Merge pull request #1001 from nlohmann/leak 
Fix memory leak during parser callback
 2018-03-09 21:23:00 +01:00
Niels Lohmann 62030615a0 Merge pull request #986 from theodelrieu/fix/basic_json_conversion 
Fix/basic json conversion
 2018-03-06 19:27:39 +01:00
Niels Lohmann fdecbf6e1e Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition 
fixed misprinted condition detected by PVS Studio.
 2018-03-05 15:57:57 +01:00
Niels Lohmann 13ca723c38 Merge pull request #981 from wla80/develop 
Make integration section concise
 2018-02-26 16:51:51 +01:00
Niels Lohmann 20b5f4d89c Merge pull request #969 from theodelrieu/fix/924 
Fix constraints on from_json(CompatibleArrayType)
 2018-02-12 18:17:59 +01:00
Niels Lohmann b02e3bb0b6 Merge pull request #957 from theodelrieu/fix_coveralls 
Make coveralls watch the include folder
 2018-02-12 15:02:21 +01:00
Niels Lohmann e5d538c5ea Merge pull request #954 from pfultz2/patch-1 
Add a note about installing the library with cget
 2018-02-09 23:28:54 +01:00
Niels Lohmann 556e30f759 Merge pull request #955 from patrikhuber/patch-1 
Fix links in README.md
 2018-02-06 20:18:14 +01:00
Niels Lohmann ce7d0ebf5d Merge pull request #944 from theodelrieu/fix/cmake_install 
fix cmake install directory (for real this time)
 2018-02-01 18:39:07 +01:00
Niels Lohmann 9958dde3da Merge pull request #950 from kaidokert/develop 
Templatize std::string in binary_reader #941
 2018-02-01 09:29:53 +01:00
Niels Lohmann ae235139b9 Merge pull request #940 from kaidokert/develop 
Allow overriding THROW/CATCH/TRY macros with no-exceptions #938
 2018-01-29 22:04:26 +01:00
Niels Lohmann 7aace7c976 Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning 
Removed compiler warning about unused variable 'kMinExp'
 2018-01-27 16:51:52 +01:00
Niels Lohmann 0e2211df0e Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd 
Howto installation of json_fwd.hpp (fixes #923)
 2018-01-25 17:11:21 +01:00
Niels Lohmann f05c3edc21 Merge pull request #930 from Pipeliner/develop 
Fix a typo in README.md
 2018-01-23 07:32:23 +01:00
Niels Lohmann f5c4e9f3a1 Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types 
fix sfinae on basic_json UDT constructor
 2018-01-23 07:32:06 +01:00
Niels Lohmann 010e596001 Merge pull request #915 from abolz/dtoa 
Floating-point formatting
 2018-01-21 15:02:57 +01:00
Niels Lohmann 6402077ac2 Merge pull request #876 from nlohmann/feature/rfc7396 
JSON Merge Patch (RFC 7396)
 2018-01-18 06:49:31 +01:00
Niels Lohmann d9446b0e6e Merge pull request #911 from theodelrieu/fix/cmake_install 
Fix/cmake install
 2018-01-14 20:08:49 +01:00
Niels Lohmann b67e00b9b5 Merge pull request #700 from theodelrieu/refactor/split_it 
Refactor/split it
 2018-01-09 07:57:01 +01:00
Niels Lohmann 337e9824ea Merge pull request #900 from Dobiasd/patch-1 
fix link to the documentation of the emplace function
 2018-01-04 17:11:18 +01:00
Niels Lohmann f28fc2261a Merge pull request #858 from mattismyname/develop 
🔧 Fix up a few more effc++ items
 2017-12-28 12:13:19 +01:00
Niels Lohmann 184e9c6aa7 Merge pull request #885 from TinyTinni/develop 
Includes CTest module/adds BUILD_TESTING option
 2017-12-23 11:09:46 +01:00
Niels Lohmann e54b6ace94 Merge pull request #882 from erengy/fix-msvc-c4819 
Fix MSVC warning C4819
 2017-12-17 19:52:57 +01:00
Niels Lohmann 1ca6ec1dc0 Merge pull request #880 from nlohmann/coverity_scan 
Merge branch 'develop' into coverity_scan
 2017-12-17 11:24:40 +01:00
Niels Lohmann 7bf007f2bc Merge pull request #879 from nlohmann/feature/algorithms 
✅ re-added tests for algorithms
 2017-12-16 12:41:07 +01:00
Niels Lohmann 2e1b1061cd Merge pull request #875 from nlohmann/feature/spelling 
Overworked library toward 3.0.0 release
 2017-12-14 22:31:19 +01:00
Niels Lohmann f80827d068 Merge pull request #873 from nlohmann/feature/issue872 
🚨 remove C4996 warnings #872
 2017-12-14 09:35:48 +01:00
Niels Lohmann f7ae143a93 Merge pull request #870 from nlohmann/feature/issue838 
💥 throwing an exception in case dump encounters a non-UTF-8 string #838
 2017-12-13 06:34:11 +01:00
Niels Lohmann 383743c6c0 Merge pull request #868 from nlohmann/feature/issue867 
📝 fixing documentation #867
 2017-12-11 08:55:26 +01:00
Niels Lohmann 0693945230 Merge pull request #860 from bogemic/std_iterator_conformance_cpp17 
iter_impl template conformance with C++17
 2017-12-08 07:55:47 +01:00
Niels Lohmann c5e731774a Merge pull request #856 from bogemic/std_allocator_conformance_cpp17 
Std allocator conformance cpp17
 2017-12-06 21:52:52 +01:00
Niels Lohmann fa76f2efd7 Merge pull request #855 from theodelrieu/fix/cmake_include_directories 
cmake: use BUILD_INTERFACE/INSTALL_INTERFACE
 2017-12-06 20:47:38 +01:00
Niels Lohmann 0e3a0b730b Merge pull request #854 from theodelrieu/fix/force_msvc_stacktrace 
to/from_json: add a MSVC-specific static_assert to force a stacktrace
 2017-12-05 19:36:31 +01:00
Niels Lohmann f4c01601fa Merge pull request #844 from TinyTinni/develop 
Add .natvis for MSVC debug view
 2017-12-04 21:43:22 +01:00
Niels Lohmann 52ca35b2b0 Merge pull request #829 from jowr/patch-1 
Updated hunter package links
 2017-11-18 13:35:21 +01:00
Niels Lohmann 1af5601a2a Merge pull request #811 from Itja/patch-1 
Typos README
 2017-10-31 18:23:42 +01:00
Niels Lohmann 73d0095154 Merge pull request #807 from theodelrieu/fix/805 
add forwarding references to json_ref constructor
 2017-10-28 15:33:22 +02:00
Niels Lohmann 77f8e2f987 Merge pull request #795 from jseward/develop 
Add transparent comparator and perfect forwarding support to find() and count()
 2017-10-27 11:47:23 +02:00
Niels Lohmann 3094640446 Merge pull request #764 from pjkundert/develop-simplify-istream 
Simplified istream handing #367
 2017-10-22 08:52:28 +02:00
Niels Lohmann ef40673acb Merge branch 'develop' into develop-simplify-istream 2017-10-22 08:52:15 +02:00
Niels Lohmann 33df3250c3 Merge pull request #793 from sonulohani/develop 
Error : 'identifier "size_t" is undefined' in linux
 2017-10-21 10:58:27 +02:00
Niels Lohmann 2e281ba64b Merge pull request #788 from jseward/develop 
Fix Visual Studio 2017 warnings
 2017-10-18 15:04:24 +02:00
Niels Lohmann 7c8f0a4186 Merge pull request #785 from jseward/develop 
Fix warning C4706 on Visual Studio 2017 - fixes #784
 2017-10-16 19:48:17 +02:00
Niels Lohmann b27a142ec0 Merge pull request #783 from eld00d/patch-1 
Set GENERATE_TAGFILE in Doxyfile
 2017-10-16 17:54:28 +02:00
Niels Lohmann 4e81c1db47 Merge pull request #765 from nlohmann/feature/issue698 
using more CMake
 2017-10-04 10:39:56 +02:00