Niels Lohmann
|
28048d8207
|
Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into develop
Conflicts:
doc/examples/swap__binary_t.link
|
2020-06-07 21:02:08 +02:00 |
|
Niels Lohmann
|
eca5490b94
|
📝 add example link for swap function
|
2020-06-07 21:01:13 +02:00 |
|
Niels Lohmann
|
8c1d26e186
|
📝 add documentation and example for accept function
|
2020-06-07 20:59:43 +02:00 |
|
Niels Lohmann
|
543dcee3a7
|
Merge pull request #2174 from nlohmann/fix_warnings
Fix warnings
|
2020-06-07 20:35:05 +02:00 |
|
Niels Lohmann
|
907803189b
|
🏁 fix MSVC 2015 compilation
|
2020-06-07 12:51:33 +02:00 |
|
Niels Lohmann
|
e6a7e7a16a
|
🚑 hotfix for #2177
|
2020-06-07 12:41:36 +02:00 |
|
Guillaume Racicot
|
82fbbeeac5
|
Adapted unit tests to use ADL calls for swap like the new swappable concept
|
2020-06-06 12:28:52 -04:00 |
|
Guillaume Racicot
|
225c8f150a
|
Disable std::swap specialization in C++20 and added a friend swap function
|
2020-06-06 11:36:39 -04:00 |
|
Niels Lohmann
|
bf2e714e96
|
🚨 fix warnings
|
2020-06-06 14:30:17 +02:00 |
|
Niels Lohmann
|
7444c7fa25
|
Merge pull request #2145 from FrancoisChabot/1813-user-input
Fix Issue#1813: user defined input adapters
|
2020-06-05 14:30:39 +02:00 |
|
Niels Lohmann
|
dd7e25927f
|
🚨 fix warning
|
2020-06-05 08:27:15 +02:00 |
|
Niels Lohmann
|
5fe6b83c26
|
Merge pull request #2158 from dota17/output_adapter
Fix PR#1006
|
2020-06-05 08:25:19 +02:00 |
|
chenguoping
|
ad2b4ff23b
|
recover original blank line
|
2020-06-05 14:23:00 +08:00 |
|
chenguoping
|
0f67c5849f
|
undo: remove comment
|
2020-06-05 10:09:15 +08:00 |
|
Niels Lohmann
|
2df5f107a9
|
📝 add page on parsing and exceptions
|
2020-06-04 14:01:57 +02:00 |
|
Niels Lohmann
|
32bda1a7af
|
Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs
|
2020-06-04 13:07:20 +02:00 |
|
Niels Lohmann
|
24e8562664
|
👷 remove Clang 8
|
2020-06-04 12:48:03 +02:00 |
|
Niels Lohmann
|
a53e3a5443
|
👷 try Clang 8
|
2020-06-04 12:34:56 +02:00 |
|
Niels Lohmann
|
dc323314d5
|
👷 try Clang 10
|
2020-06-04 12:29:53 +02:00 |
|
Niels Lohmann
|
402c34c526
|
👷 try Clang 10
|
2020-06-04 12:27:37 +02:00 |
|
Niels Lohmann
|
65c4b07451
|
🎨 replace alternative operators (and, not, or)
|
2020-06-03 21:22:07 +02:00 |
|
Niels Lohmann
|
0498202a03
|
🎨 replace alternative operators (and, not, or)
|
2020-06-03 14:20:36 +02:00 |
|
Niels Lohmann
|
4f04ea1bef
|
Merge branches 'clang_windows' and 'develop' of https://github.com/nlohmann/json into clang_windows
|
2020-06-03 14:01:18 +02:00 |
|
Niels Lohmann
|
9212590764
|
👥 update contributor list
|
2020-06-03 13:56:01 +02:00 |
|
Niels Lohmann
|
9708b1e9c3
|
🔥 remove Code Inspector
|
2020-06-03 13:49:46 +02:00 |
|
Niels Lohmann
|
68fd772fdf
|
👷 add Code Inspector via GitHub Action
|
2020-06-03 13:44:33 +02:00 |
|
Niels Lohmann
|
9bc2a7fa25
|
👷 add Code Inspector via GitHub Action
|
2020-06-03 13:39:56 +02:00 |
|
Niels Lohmann
|
c24218afe8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-06-03 13:38:15 +02:00 |
|
Niels Lohmann
|
2c4be7d65c
|
Merge pull request #2152 from TotalCaesar659/patch-1
Update URLs to HTTPS
|
2020-06-03 12:31:33 +02:00 |
|
Niels Lohmann
|
2ad847f21b
|
🔨 fix doxygen link
|
2020-06-03 12:30:42 +02:00 |
|
Niels Lohmann
|
fdf5a63dfd
|
🔨 fix Doxygen link
|
2020-06-03 12:30:10 +02:00 |
|
Niels Lohmann
|
309acb445a
|
Merge pull request #2153 from dota17/issue#1972
Fix issue#1972
|
2020-06-03 12:26:17 +02:00 |
|
chenguoping
|
eca4b8785c
|
fix test case in PR#1006
|
2020-06-02 15:44:26 +08:00 |
|
chenguoping
|
fff1499963
|
add comment about PR#1006
|
2020-06-02 15:43:57 +08:00 |
|
chenguoping
|
8cd39578e3
|
add test case
|
2020-06-01 11:34:03 +08:00 |
|
Niels Lohmann
|
5ea205f570
|
👷 install clang
|
2020-05-30 18:17:54 +02:00 |
|
Niels Lohmann
|
5f10d5d156
|
👷 install clang
|
2020-05-30 18:15:13 +02:00 |
|
Niels Lohmann
|
7c0c522b96
|
👷 install clang
|
2020-05-30 18:11:54 +02:00 |
|
Niels Lohmann
|
522ec5d7bd
|
👷 install clang
|
2020-05-30 18:06:52 +02:00 |
|
Niels Lohmann
|
7e5c2a480a
|
👷 install clang
|
2020-05-30 18:04:07 +02:00 |
|
Niels Lohmann
|
9c971c2d2f
|
👷 install clang
|
2020-05-30 17:40:27 +02:00 |
|
Niels Lohmann
|
4ba8c95794
|
👷 install clang
|
2020-05-30 13:41:18 +02:00 |
|
Niels Lohmann
|
fbd3e8f677
|
👷 install clang
|
2020-05-30 13:35:19 +02:00 |
|
Niels Lohmann
|
0309025b45
|
👷 set full path
|
2020-05-30 13:28:44 +02:00 |
|
Niels Lohmann
|
9191926fff
|
👷 use Makefiles
|
2020-05-30 13:23:13 +02:00 |
|
Niels Lohmann
|
42ef2a5adb
|
👷 use Clang compiler
|
2020-05-30 13:15:56 +02:00 |
|
Niels Lohmann
|
2182935397
|
👷 add Clang/Windows step
|
2020-05-30 13:07:23 +02:00 |
|
chenguoping
|
4350c5ed97
|
fix bug in issue#1972
|
2020-05-30 17:15:56 +08:00 |
|
TotalCaesar659
|
0aa13599f0
|
Update URLs to HTTPS
|
2020-05-30 06:02:25 +03:00 |
|
Francois Chabot
|
0da131d717
|
minor readme correction
|
2020-05-28 17:12:26 -04:00 |
|