Niels Lohmann
6471a63115
Merge pull request #2729 from theShmoo/without-io
...
Possibility to use without the dependency to file io and streams to use in intel sgx enclaves
2021-06-26 12:50:06 +02:00
Niels Lohmann
624f59eacb
Merge pull request #2826 from justanotheranonymoususer/patch-1
...
Consistency with `using` in README.md
2021-06-21 14:48:39 +02:00
justanotheranonymoususer
e970f31066
Update arbitrary_types.md
2021-06-18 12:44:27 +03:00
justanotheranonymoususer
c3d7fcb76c
Update README.md
2021-06-18 11:04:53 +03:00
justanotheranonymoususer
9710108d6a
Consistency with using in README.md
2021-06-17 21:39:29 +03:00
David Pfahler
572343be63
Merge branch 'nlohmann:develop' into without-io
2021-06-15 12:24:19 +02: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
David Pfahler
aa849a2275
Merge branch 'nlohmann:develop' into without-io
2021-06-14 08:22:49 +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
David Pfahler
e939b59683
fixed amalgation file for #2728
2021-05-31 14:27:23 +02:00
David Pfahler
ae9bbbc941
include io only if JSON_NO_IO is not set for #2728
2021-05-31 14:26:45 +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
Jean-Philippe Lemieux
afbb84b2c8
Add a cmake option to use SYSTEM in target_include_directories
...
Without SYSTEM static analysis like clang-tidy raise warnings on
json.hpp. This is not desirable for projects embedding nlohmann_json
Tests:
- Validated that without the option OFF the warnings are raised as
before
- Validated that with the option ON the warnings are silenced
2021-05-05 16:19:24 -04: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
Morten Fyhn Amundsen
193bf9d6b6
Fix typo in README
2021-05-03 09:46:00 +02:00
Niels Lohmann
b2e784c33b
Merge pull request #2749 from nlohmann/docs
2021-04-29 23:05:33 +02:00
Niels Lohmann
d0ab2b86c3
📝 update documentation
2021-04-29 17:19:57 +02:00
Niels Lohmann
8a29a6ecf4
Merge pull request #2731 from theShmoo/custom-cpp-version
...
Fixes #2730
2021-04-29 09:55:16 +02:00
