wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-10 16:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,478 Commits 17 Branches 57 Tags
282bafae4f2dd8a3399897e5657984121fedc7f5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Niels Lohmann b05ea3de55 Merge pull request #753 from gregmarr/patch-1 
Add info for the vcpkg package.
 2017-09-26 22:36:36 +02:00
Niels Lohmann 5b71bf09a1 Merge pull request #708 from theodelrieu/fix/from_json_tuple_pair 
fix from_json implementation for pair/tuple
 2017-08-24 12:40:16 +02:00
Niels Lohmann a46afd4008 Merge pull request #679 from traits/patch-1 
Digraph warning
 2017-08-10 11:39:13 +02:00
Niels Lohmann d26b3f1fe5 Merge pull request #686 from WebProdPP/patch-1 
Update json.hpp
 2017-08-10 06:44:59 +02:00
Niels Lohmann 345846b514 Merge pull request #685 from daixtrose/patch-1 
Remove duplicate word
 2017-08-09 15:32:33 +02:00
Niels Lohmann 6e5b895f87 Merge pull request #682 from kbthomp1/fix-intel-osx 
To fix compilation issue for intel OSX compiler
 2017-08-09 10:16:03 +02:00
Niels Lohmann b32a6b8c75 Merge pull request #678 from DmitryKuk/develop 
massage -> message
 2017-08-05 13:42:43 +02:00
Niels Lohmann 0ea0d7d860 Merge pull request #674 from wincent/patch-1 
Fix "not constraint" grammar in docs
 2017-08-01 20:21:04 +02:00
Niels Lohmann 76ecb2bd60 Merge pull request #671 from dan-42/develop 
Add documentation for integration with CMake and hunter
 2017-08-01 07:15:55 +02:00
Niels Lohmann 67fb517ccd Merge pull request #669 from dan-42/change_installed_cmake_include_path 
REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse
 2017-07-30 20:01:03 +02:00
Niels Lohmann 80e95844f6 Merge pull request #663 from himikof/move-construction 
Support moving from rvalues in std::initializer_list
 2017-07-30 20:00:46 +02:00
Niels Lohmann aad55219f8 Merge branch 'develop' into move-construction 2017-07-30 19:49:24 +02:00
Niels Lohmann c136b6f200 Merge pull request #666 from effolkronium/develop 
enable_testing only if the JSON_BuildTests is ON
 2017-07-27 20:48:56 +02:00
Niels Lohmann 8a9133c6b2 Merge pull request #652 from olegendo/develop 
Rename BuildTests to JSON_BuildTests
 2017-07-15 11:39:27 +02:00
Niels Lohmann f1fabd1ba2 📄 added code of conduct 
added Contributor Covenant Code of Conduct
 2017-07-13 19:16:41 +02:00
Niels Lohmann dad4916f9e Merge pull request #654 from ryanjmulder/develop 
add ensure_ascii parameter to dump. #330
 2017-07-12 07:58:45 +02:00
Niels Lohmann 7dee868a42 Merge pull request #643 from theodelrieu/refacto/split_basic_json 
Refacto/split basic json
 2017-07-09 23:12:35 +02:00
Niels Lohmann a0e0579374 Merge pull request #650 from olegendo/develop 
Don't include <iostream>, use std::make_shared
 2017-07-09 11:12:46 +02:00
Niels Lohmann 5ee651c387 Merge pull request #630 from Chocobo1/doc_neq 
fix typo in operator__notequal example
 2017-06-21 18:54:18 +02:00
Niels Lohmann dad6051f37 Merge pull request #629 from Chocobo1/c4819 
Fix MSVC warning C4819
 2017-06-21 18:54:03 +02:00
Niels Lohmann 4e6f548c0b Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions 
add pair/tuple conversions
 2017-06-19 17:31:10 +02:00
Niels Lohmann 7b97100ffd Merge pull request #626 from koemeet/bugfix/vs2017-min-macro-fix 
[BugFix] Add parentheses around std::min
 2017-06-17 23:58:13 +02:00
Niels Lohmann d415293d41 Merge pull request #615 from theodelrieu/develop 
remove std::pair support
 2017-06-16 18:16:20 +02:00
Niels Lohmann 6caad48e44 Merge pull request #595 from HenryRLee/iterator_arithmetic 
Issue #593 Fix the arithmetic operators in the iterator and reverse iterator
 2017-06-10 18:26:48 +02:00
Niels Lohmann 52f934cbbf Merge pull request #609 from theodelrieu/develop 
Add pair support, fix CompatibleObject conversions (fixes #600)
 2017-06-07 16:38:23 +02:00
Niels Lohmann bfdf0d1ce6 Merge pull request #598 from HenryRLee/issue550 
#550 Fix iterator related compiling issues for Intel icc
 2017-06-06 20:41:42 +02:00
Niels Lohmann 0f4131d138 Merge pull request #583 from zhaohuaxishi/doxygen_error 
fix doxygen error of basic_json::get()
 2017-05-15 21:09:43 +02:00
Niels Lohmann 8b88e1b266 Merge pull request #579 from Type1J/develop_feature_first_second 
Fixing assignement for iterator wrapper second, and adding unit test
 2017-05-13 11:37:57 +02:00
Niels Lohmann 5beea35443 Merge pull request #578 from Type1J/develop_feature_first_second 
Adding first and second properties to iteration_proxy_internal
 2017-05-10 17:25:54 +02:00
Niels Lohmann 15ef9b8a35 Merge pull request #576 from Type1J/develop 
Adding support for Meson.
 2017-05-10 16:32:14 +02:00
Niels Lohmann 4f6b63e492 Merge pull request #545 from theodelrieu/feature/enum_class_support 
add enum class default conversions
 2017-04-03 22:13:59 +02:00
Niels Lohmann 7881783745 Merge pull request #540 from tinloaf/diagnostics 
Properly pop diagnostics
 2017-03-30 17:25:29 +02:00
Niels Lohmann 0f9585685a Merge pull request #536 from vpetrigo/feature/VS17_appveyor_support 
Add Visual Studio 17 image to appveyor build matrix
 2017-03-25 14:12:30 +01:00
Niels Lohmann bba688f53e Merge pull request #534 from TedLyngmo/utf8_encoding_enhancement 
UTF8 encoding enhancement
 2017-03-24 19:38:29 +01:00
Niels Lohmann 8a872927e8 Merge pull request #530 from berkus/patch-1 
Fix typo
 2017-03-23 13:57:54 +01:00
Niels Lohmann 67a06834b0 Merge pull request #526 from krzysztofwos/feature/exception-base-class 
Make exception base class visible in basic_json
 2017-03-22 07:50:34 +01:00
Niels Lohmann 2d474b5273 Merge pull request #510 from alex-weej/patch-1 
🎨 Namespace `uint8_t` from the C++ stdlib
 2017-03-17 06:47:11 +01:00
Niels Lohmann 773b33e016 Merge pull request #508 from theodelrieu/feature/c_array_conversion 
add to_json method for C arrays
 2017-03-16 19:00:58 +01:00
Niels Lohmann 754ce0b991 Merge pull request #496 from TedLyngmo/fix_effcplusplus_warnings 
Fix -Weffc++ warnings (GNU 6.3.1)
 2017-03-11 15:57:10 +01:00
Niels Lohmann 22b9a301d6 Merge pull request #450 from nlohmann/TurpentineDistillery-feature/locale_independent_str_to_num 
TurpentineDistillery feature/locale independent str to num
 2017-02-14 07:18:35 +01:00
Niels Lohmann 4746a4c536 💄 minor change 2017-02-08 17:56:43 +01:00
Niels Lohmann 163f8397fd ✏️ fixed a typo #446 2017-02-05 17:11:26 +01:00
Niels Lohmann 8d88a1da2a 🔀 merged #379 and fixed conflicts 2017-02-05 13:13:41 +01:00
Niels Lohmann d284c86dd1 ✅ uncommented some tests 2017-02-04 21:00:41 +01:00
Niels Lohmann 922fe693e1 ⬆️ updated Catch to v1.7.0 2017-02-04 15:30:28 +01:00
Niels Lohmann 1cfdc2a753 🐛 fixed test compilation 2017-02-04 08:25:55 +01:00
Niels Lohmann 77d6f70602 📝 acknowledgments for #442 and #445 2017-02-03 18:28:22 +01:00
Niels Lohmann d6afaa8e16 📝 fixing a documentation issue #442 2017-02-03 18:15:37 +01:00
Niels Lohmann 5976caf032 ⚡ improved test compilation speed #445 2017-02-03 18:09:55 +01:00
Niels Lohmann 16af771277 ✅ added roundtrip test for the Big List of Naughty Strings 2017-02-01 17:34:39 +01:00
Niels Lohmann bf8fdac99a 👷 dropped Doozer.io support 2017-02-01 16:41:05 +01:00
Niels Lohmann 7bb7033383 Merge branch 'develop' into coverity_scan 2017-02-01 16:03:51 +01:00
Niels Lohmann c75865d88c 🐛 fixed -Weffc++ warnings 2017-02-01 15:13:21 +01:00