David Pfahler
|
6c99b750da
|
Fixes #2728
includes some macros to be defined for using without file io.
|
2021-08-07 21:46:25 +08:00 |
|
Niels Lohmann
|
69de3eb786
|
📝 fix documentation (#2845)
|
2021-08-07 21:46:25 +08:00 |
|
justanotheranonymoususer
|
44201db12b
|
Update arbitrary_types.md
|
2021-08-07 21:46:25 +08:00 |
|
justanotheranonymoususer
|
7ea27324c0
|
Update README.md
|
2021-08-07 21:46:25 +08:00 |
|
justanotheranonymoususer
|
a5104d1229
|
Consistency with using in README.md
|
2021-08-07 21:46:25 +08:00 |
|
Chaoya Li
|
db0287d2ef
|
trigger upstream CI
|
2021-07-21 08:43:45 +08:00 |
|
Chaoya Li
|
98ac25b2ce
|
Add const to getters for macro tests
|
2021-06-28 21:02:29 +08:00 |
|
Chaoya Li
|
f452a92c07
|
Added test for serialization of default constructed object
|
2021-06-28 18:35:02 +08:00 |
|
Chaoya Li
|
35c37c8ab5
|
Renamed default_obj in to avoid name clashes
|
2021-06-28 18:06:46 +08:00 |
|
Chaoya Li
|
d8ba9f43b0
|
Updated docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT
|
2021-06-28 18:02:14 +08:00 |
|
Chaoya Li
|
5664233fe4
|
Rephrased docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT
|
2021-06-26 05:57:45 +08:00 |
|
Chaoya Li
|
5a5832e178
|
Updated docs for NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT accordingly
|
2021-06-25 19:45:01 +08:00 |
|
Chaoya Li
|
7aeda9d433
|
Reverted changes for NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE; added new macros NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT
|
2021-06-22 09:00:11 +08:00 |
|
Chaoya Li
|
76f6740e30
|
Allow default values for NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
|
2021-06-15 10:14:44 +08:00 |
|
Niels Lohmann
|
18a5f4c7ca
|
Merge pull request #2790 from nlohmann/macos_standards
Add C++ standards to macOS matrix
|
2021-06-14 20:23:21 +02:00 |
|
Niels Lohmann
|
71a514a651
|
Merge pull request #2770 from jasmcaus/patch-1
Keep consistent formatting
|
2021-06-14 07:18:46 +02:00 |
|
Niels Lohmann
|
fde6e1f800
|
Merge branch 'develop' of https://github.com/nlohmann/json into macos_standards
|
2021-06-14 07:17:47 +02:00 |
|
Niels Lohmann
|
95ad4ae071
|
Merge pull request #2817 from nlohmann/fix_ci
Fix CI
|
2021-06-14 07:16:32 +02:00 |
|
Niels Lohmann
|
802895b483
|
👷 remove Clang 10
|
2021-06-13 14:14:10 +02:00 |
|
Niels Lohmann
|
032f32ebe4
|
👷 add Clang 12
|
2021-06-13 14:04:20 +02:00 |
|
Niels Lohmann
|
30e52eb046
|
👷 execute all tests
|
2021-05-30 13:28:58 +02:00 |
|
Niels Lohmann
|
2b685c744b
|
👷 reduce load
|
2021-05-29 13:10:28 +02:00 |
|
Niels Lohmann
|
9f5ee3f145
|
👷 fix syntax
|
2021-05-28 22:27:46 +02:00 |
|
Niels Lohmann
|
311730bc3d
|
👷 add C++ standards to macOS matrix #2491
|
2021-05-28 22:23:50 +02:00 |
|
Niels Lohmann
|
e10a3fac8a
|
Merge pull request #2789 from TotalCaesar659/patch-2
Update URLs to HTTPS
|
2021-05-28 10:31:04 +02:00 |
|
TotalCaesar659
|
9a599ae63a
|
Update URLs to HTTPS
|
2021-05-28 00:53:17 +03:00 |
|
Jason Dsouza
|
f118091eaa
|
Update CMakeLists.txt
|
2021-05-15 23:39:15 +05:30 |
|
Niels Lohmann
|
0972f7ff0e
|
Merge pull request #2771 from offa/conan_package_url
Link to Conan Center package added
|
2021-05-15 19:26:34 +02:00 |
|
offa
|
7935a683f5
|
link to conan package in readme
|
2021-05-12 16:46:32 +02:00 |
|
Jason Dsouza
|
6d7959e05d
|
Keep consistent formatting
|
2021-05-12 19:25:06 +05:30 |
|
Niels Lohmann
|
7cafc5c63f
|
📝 document Drone CI
|
2021-05-10 14:23:27 +02:00 |
|
Niels Lohmann
|
e856b50791
|
🔥 remove arm build
|
2021-05-09 14:22:46 +02:00 |
|
Niels Lohmann
|
a44b29ecf1
|
🔧 fix paths
|
2021-05-09 13:52:16 +02:00 |
|
Niels Lohmann
|
014724f362
|
⚗️ change path
|
2021-05-09 13:49:42 +02:00 |
|
Niels Lohmann
|
0c62748b75
|
🔧 change repository
|
2021-05-09 13:46:48 +02:00 |
|
Niels Lohmann
|
c73bd8b251
|
🔧 ignore certificate
|
2021-05-09 13:44:21 +02:00 |
|
Niels Lohmann
|
3685dbdcfd
|
🔧 checkout cmake via git
|
2021-05-09 13:41:40 +02:00 |
|
Niels Lohmann
|
9746f72d71
|
🔨 do not check certificate
|
2021-05-09 13:34:28 +02:00 |
|
Niels Lohmann
|
df6fa6c11c
|
👷 arm and arm64
|
2021-05-09 13:32:50 +02:00 |
|
Niels Lohmann
|
e6e7309514
|
👷 arm and arm64
|
2021-05-09 13:31:27 +02:00 |
|
Niels Lohmann
|
42f2512290
|
🔧 skip slow tests
|
2021-05-09 13:00:35 +02:00 |
|
Niels Lohmann
|
f3193e1e94
|
🔧 build ctest
|
2021-05-09 11:07:57 +02:00 |
|
Niels Lohmann
|
9ec8f4efa8
|
🔧 fix ctest path
|
2021-05-09 10:39:37 +02:00 |
|
Niels Lohmann
|
27a71ccdd8
|
🔧 fix path
|
2021-05-08 20:42:24 +02:00 |
|
Niels Lohmann
|
a6e2fd1b15
|
🔧 use built CMake
|
2021-05-08 14:41:43 +02:00 |
|
Niels Lohmann
|
77a5cd247e
|
🔧 build cmake
|
2021-05-08 13:56:19 +02:00 |
|
Niels Lohmann
|
1d8869f8bc
|
👷 add Drone CI
|
2021-05-08 13:33:30 +02:00 |
|
Niels Lohmann
|
fc2f7116fe
|
Merge pull request #2756 from nlohmann/issue2755
replace EOF with std::char_traits<char>::eof()
|
2021-05-04 12:56:46 +02:00 |
|
Niels Lohmann
|
b08139ea4b
|
♻️ replace EOF with std::char_traits<char>::eof()
|
2021-05-04 10:22:34 +02:00 |
|
Niels Lohmann
|
d4f446592f
|
Merge pull request #2754 from mortenfyhn/patch-1
Fix typo in README
|
2021-05-03 12:24:55 +02:00 |
|