1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-31 10:24:23 +03:00
Commit Graph

80 Commits

Author SHA1 Message Date
a501365ea2 Merge branch 'feature/hedley' into develop 2019-07-14 20:58:08 +02:00
b17440c12f 🚨 fix compiler warnings 2019-07-12 21:05:16 +02:00
90798caa62 🚚 rename Hedley macros 2019-07-01 22:37:30 +02:00
897362191d 🔨 add NLOHMANN_JSON prefix and undef macros 2019-07-01 22:24:39 +02:00
1720bfedd1 ⚗️ add Hedley annotations 2019-06-30 22:14:02 +02:00
3db14cbfae 📝 Improve doc on const_inter constructor 2019-06-24 15:40:01 +04:30
798e83a038 Workaround msvc2015 bug with explicit copy-constructor for const_iterator 2019-06-22 21:15:11 +04:30
d21d298397 🎨 fixed indentation 2019-03-28 14:23:26 +01:00
b8451c236f 🚨 fixed warnings 2019-03-17 12:01:49 +01:00
27011e3718 🚨 fixed warnings 2019-03-15 14:55:13 +01:00
45819dce54 Disable -Wmismatched-tags warning on tuple_size / tuple_element 2019-01-30 12:59:50 -05:00
e5753b14a8 🚨 fixed another linter warning #1400
Closes #1400.
2019-01-13 15:40:49 +01:00
5c04cc1009 🔨 fixed includes 2019-01-13 15:31:22 +01:00
45f5611d9b 🚨 fixed two warnings 2018-12-20 22:41:48 +01:00
85849940ba Merge pull request #1391 from pratikpc/develop
Added Support for Structured Bindings
2018-12-20 08:58:08 +01:00
ebd3f45808 Added Support for Structured Bindings
For further details, read https://github.com/nlohmann/json/issues/1388 and https://blog.tartanllama.xyz/structured-bindings/
2018-12-19 20:17:52 +05:30
f1080d7c39 Code review. 2018-12-18 20:44:37 +00:00
2c23f0a346 Changes requested from code review. 2018-12-08 15:46:33 +00:00
f665a92330 Implement SFINAE friendly iterator_traits and use that instead. 2018-11-07 18:39:25 +00:00
858e75c4df 🚨 fixed some clang-tidy warnings 2018-10-07 18:39:18 +02:00
f6febbe359 split meta.hpp, add detected_t (used to define concepts) 2018-08-16 11:58:42 +02:00
86a96b059d Merge pull request #1134 from Daniel599/feature/items_iterator
fixed compile error for #1045
2018-06-28 21:21:17 +02:00
963d06a13c 📝 fix links to cppreference named requirements
"Concepts" have been renamed to "named requirements".
This is because P0898R3 Standard Library Concepts has been merged into
C++20.
Cppreference have moved their links accordingly.
2018-06-24 22:36:19 +02:00
9f00db48d9 📝 link to cppreference via HTTPS 2018-06-24 22:34:47 +02:00
c02de445bf 🚨 fixed more compiler warnings 2018-06-23 11:00:42 +02:00
66dd1a846d 🚨 fixed more compiler warnings 2018-06-23 10:47:55 +02:00
481ace65c4 🔨 only calculate array index string when needed #1098 2018-05-27 12:04:22 +02:00
90eb0a91e0 keys are now returned as const reference #1098 2018-05-26 13:26:40 +02:00
8d8f890771 💩 first try on #1045 2018-04-10 08:29:07 +02:00
14cd019861 fix cmake install directory (for real this time)
* Rename 'develop' folder to 'include/nlohmann'
* Rename 'src' folder to 'single_include/nlohmann'
* Use <nlohmann/*> headers in sources and tests
* Change amalgamate config file
2018-02-01 11:06:51 +01:00