Niels Lohmann
|
dd04a32918
|
🐛 fix bug in diff function #1983
|
2020-04-13 14:35:36 +02: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 |
|
Alexander Myasnikov
|
4df7dc04f6
|
fix error 'setw' is not a member of 'std' in Wandbox example
|
2020-03-21 18:34:40 +03:00 |
|
Sergey Linev
|
78e911b8c3
|
Use array_idx as methods args
Avoid mix-up with array_index member
Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
|
2020-03-19 11:52:40 +01:00 |
|
Niels Lohmann
|
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 Lohmann
|
ebb5a4c09f
|
💰 add sponsor
|
2020-03-19 11:14:50 +01:00 |
|
chenguoping
|
bfc003cadf
|
catch exceptions for json_point : /xx/+99
|
2020-03-17 20:49:28 +08:00 |
|
chenguoping
|
2ccdfebaa7
|
fix typo
|
2020-03-14 18:10:55 +08:00 |
|
Niels Lohmann
|
54656ef279
|
Merge pull request #1956 from dota17/dota17-fix-typo
Fix typo in examples
|
2020-03-13 17:26:24 +01:00 |
|
Niels Lohmann
|
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 |
|
Sergey Linev
|
00049c20d0
|
Rename argument array_index to array_indx in json_pointer methods
Fixes gcc48 warning:
declaration of ‘array_index’ shadows a member of 'this' [-Wshadow]
|
2020-03-11 07:41:53 +01:00 |
|
Alexander “weej” Jones
|
5fdb1d08aa
|
README: Fix string representation of dumped json
As is it's confusing and inconsistent with the indented form right below. The backslash escapes make it confusing.
|
2020-03-10 19:37:20 +00:00 |
|
dota17
|
699e0a923c
|
fix typo in examples
|
2020-02-26 13:44:08 +08:00 |
|
Chen
|
42566c6bef
|
Update README.md
|
2020-02-17 15:40:52 +08:00 |
|
Niels Lohmann
|
61b46a56fb
|
🏗️ replace is_pod by is_trivial
|
2020-02-15 10:12:27 +01:00 |
|
Chen
|
88097a250f
|
Update README.md : add a FAQ about memory release
|
2020-02-10 21:03:57 +08:00 |
|
Niels Lohmann
|
973c52dd4a
|
Merge pull request #1923 from Coeur/typos
Some typos
|
2020-02-02 14:48:07 +01:00 |
|