haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
3363 commits 11 branches 56 tags 222 MiB
Commit graph

3363 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
chenguoping c379d02b3e Add missing testcase about NaN in unit-constructor1.cpp 2020-04-20 10:25:44 +08:00
Niels Lohmann e8356928bd
🚨 fix compiler warnings #2052 2020-04-19 13:25:02 +02:00
Niels Lohmann 4fb0795ec1
🚨 fix compiler warnings #2049 2020-04-19 13:01:36 +02:00
Niels Lohmann 45d5b09425
⬆️ doctest 2.3.7 #2048 2020-04-19 12:33:42 +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
Hubert Chathi 2b0e4c7a94 add comments 2020-04-17 15:44:12 -04: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
Michael Reilly 012c9665ac Add binary type support to all binary file formats, as well as an internally represented binary type 2020-04-14 10:22:45 -04:00
Niels Lohmann dd04a32918
🐛 fix bug in diff function #1983 2020-04-13 14:35:36 +02:00
chenguoping f5a487d1b4 fix issue1982: contains() exceptions are incorrectly raised 2020-04-13 19:41:13 +08: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 b0a3883081
🎨 fix format 2020-04-13 13:11:26 +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
Artöm Bakri Al-Sarmini 70be9751cd typo fix 2020-04-12 23:42:26 +03:00
Artöm Bakri Al-Sarmini ec955f08b4 Templatize basic_json ctor from json_ref 2020-04-12 22:32:39 +03:00
Niels Lohmann 7fcc860329
🔥 remove WhiteSource 2020-04-12 16:35:41 +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 9154e991b8
Merge branch 'develop' into feature/issue1913 2020-04-11 11:33:46 +02:00
Evgenii Sopov d164a2bf09 Added wsjcpp.yml: C++ Source Package Manager 2020-04-11 16:30:04 +07:00
Niels Lohmann 6121fc52cf
🎨 fix indentation 2020-04-10 13:22:58 +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 d01193a4e4
🎨 run "make amalgamate" 2020-04-10 13:18:12 +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
Artöm Bakri Al-Sarmini 8db02bcc55 Fix for gcc 2020-04-08 15:53:14 +03:00
Artöm Bakri Al-Sarmini fec0bdd93b still fixing 2020-04-08 00:42:03 +03:00
Artöm Bakri Al-Sarmini 4ce31695f1 Fixed formatting, trying to fix msvc build error in appveyor 2020-04-08 00:26:43 +03:00
Niels Lohmann c6b298799a
👷 remove failing Travis workers 2020-04-07 09:09:44 +02:00
chenguoping 34cf7b7a48 just restart ci 2020-04-07 10:00:21 +08:00
Thomas Braun 5607dfb48a appveyor.yml: Compile and test with latest version for __cplusplus macro on MSVC 
According to [1] the C++ macro __cplusplus has always the value 199711L
even if you enable later version of C++ support via /std.

Use one job with /Zc:__cplusplus defined so that we know that it
compiles.

[1]: https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=vs-2019
 2020-04-06 11:56:33 +02:00
Niels Lohmann 6a53a95c32 ⬆️ Hedley 13 2020-04-06 11:56:33 +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 379ed1f67e
💰 add sponsor 2020-04-05 15:23:00 +02:00
Artöm Bakri Al-Sarmini a74a031bba Fix build error 2020-04-02 15:47:08 +03:00
Artöm Bakri Al-Sarmini e4d8dc02e8 Fixes #1971 (memory leak in basic_json::push_back) 2020-04-02 15:20:25 +03:00
Miguel Magalhães 3df622a417
Update LICENSE.MIT 2020-03-25 17:24:23 +00:00
chenguoping e07686f0c7 update array_index() and add testcases 2020-03-25 15:57:20 +08:00
chenguoping 2e7d340dad docs:modify the document about operator== 2020-03-25 10:18:04 +08:00
garethsb-sony 7fe16f9400 PR for #2006 to test in AppVeyor. 2020-03-24 12:53:59 +00:00
chenguoping dcd3a6c62b move the catch of std::invalid_argument into array_index() 2020-03-23 17:24:47 +08:00
chenguoping 59cb4c93be fix C26451 warnning in serializer.hpp for VS2019 2020-03-23 16:08:47 +08:00
chenguoping 0a8216890d fix C26451 warnnings in to_chars.hpp 2020-03-23 15:27:35 +08:00
Alexander Myasnikov 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example 2020-03-21 18:34:40 +03:00