haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-15 19:05:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
2974 commits 12 branches 56 tags 226 MiB
Commit graph

2974 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann e07e8e7912
📝 updated documentation 2019-03-19 15:40:23 +01:00
Niels Lohmann 710f26f95c
📝 added documentation 2019-03-19 10:06:35 +01:00
Niels Lohmann b224c52376
🎨 cleanup 2019-03-19 09:17:14 +01:00
Niels Lohmann 37a72dac48
💚 forgot two semicolons 2019-03-18 17:23:34 +01:00
Niels Lohmann 8d3f4f21bc
🔨 clean up 2019-03-18 13:53:48 +01:00
Niels Lohmann 9fc093c9e0
👷 added targets for infer and oclint 2019-03-18 00:19:28 +01:00
Niels Lohmann 22c733e6fe
📝 added documentation 2019-03-17 22:25:18 +01:00
Niels Lohmann 56f6d1d68e
💚 fix CI and #1521 2019-03-17 15:20:22 +01:00
Niels Lohmann df0f7f2b5d
👷 overworked clang-tidy target 2019-03-17 12:02:23 +01:00
Niels Lohmann 9f26dac9b3
⬆️ updated Doxyfile 2019-03-17 12:02:05 +01:00
Niels Lohmann b8451c236f
🚨 fixed warnings 2019-03-17 12:01:49 +01:00
Niels Lohmann d6c4cd3b6d
🚨 adding targets for static analyzers 2019-03-17 00:30:08 +01:00
Niels Lohmann baf8b4be7c
➕ adding cpplint 2019-03-17 00:28:14 +01:00
Niels Lohmann 34f8b4f711
🚨 fixed more warnings 2019-03-17 00:27:44 +01:00
Niels Lohmann 02b3494711
🔥 removing unstable macOS builds on Traivs 2019-03-16 08:28:44 +01:00
Niels Lohmann b02ee16721
🚨 fixed warnings 2019-03-15 15:55:52 +01:00
Niels Lohmann 8d6c033f80
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2019-03-15 14:55:15 +01:00
Niels Lohmann 27011e3718
🚨 fixed warnings 2019-03-15 14:55:13 +01:00
Niels Lohmann 9dc3552931
Merge pull request #1514 from naszta/macrofix 
Change macros to numeric_limits
 2019-03-15 12:46:42 +01:00
Ferenc Nasztanovics 0067ea8f9e Change macros to numeric_limits #1483 2019-03-13 23:44:34 +01:00
Niels Lohmann 0c65ba960e
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2019-03-13 22:14:57 +01:00
Niels Lohmann 546e2cbf5e
🚨 fixed some warnings 2019-03-13 22:14:53 +01:00
Niels Lohmann c6fc902184
Merge pull request #1489 from andreas-schwab/develop 
Do proper endian conversions
 2019-03-13 11:57:58 +01:00
Niels Lohmann d39842e68f
Merge pull request #1330 from ax3l/topic-installEmbed 
CMake: Optional Install if Embedded
 2019-03-13 11:13:09 +01:00
Niels Lohmann 670f42b561
🔥 removing Xcode 6.4 builder 2019-03-11 22:59:22 +01:00
Niels Lohmann c983b67112
Merge pull request #1469 from garethsb-sony/json_pointer-append 
Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers
 2019-03-11 22:47:08 +01:00
Niels Lohmann c11bead2ae
👷 removing more retired Travis images 2019-03-11 21:22:30 +01:00
Niels Lohmann 3cd1dac653
🚨 fix MSVC warning #1502 2019-03-11 15:33:23 +01:00
Niels Lohmann cabe2357b8
Merge pull request #1492 from stac47/fix_gcc9_allocator 
Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)
 2019-03-11 15:21:54 +01:00
Niels Lohmann 16d9cdce45
📝 updated documentation of CI 2019-03-11 15:19:50 +01:00
Niels Lohmann e3729ba0a5
💚 fix compiler selection 2019-03-11 07:44:40 +01:00
Niels Lohmann e5c7fd488d
👷 trying new Travis workers 2019-03-10 22:56:14 +01:00
Niels Lohmann 5047c7a217
🐛 added missing include #1500 2019-03-10 22:26:57 +01:00
Niels Lohmann 8eb7db7277
Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if 
Use C++11 features supported by CMake 3.1.
 2019-03-10 22:08:16 +01:00
Niels Lohmann 393410e61a
Merge pull request #1495 from njlr/patch-1 
Update Buckaroo instructions in README.md
 2019-03-10 22:03:49 +01:00
Niels Lohmann 30edcaab3a
Merge pull request #1496 from lieff/develop 
fix GCC 7.1.1 - 7.2.1 on CentOS
 2019-03-10 22:01:52 +01:00
lieff 7b31e56fbf fix GCC 7.1.1 - 7.2.1 on CentOS 
closes https://github.com/nlohmann/json/issues/670
 2019-02-25 16:38:22 +03:00
Andreas Schwab bb22b1003f Do proper endian conversions 
This fixes all testsuite failures on big endian hosts.
 2019-02-25 12:09:13 +01:00
njlr 8aeee4f7e3
Update README.md 
* Updates Buckaroo instructions to v2
 2019-02-25 09:44:38 +00:00
garethsb-sony d183bd0456 Tests for json_pointer::empty and json_pointer::parent_pointer 2019-02-25 09:26:08 +00:00
garethsb-sony 08de9eeaca Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path) 2019-02-25 09:26:08 +00:00
garethsb-sony 164e0e54d9 Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path 2019-02-25 09:26:07 +00:00
Laurent Stacul ddc9f201f4 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472) 2019-02-22 16:05:41 +00:00
Niels Lohmann 21516f2bae
Merge pull request #1491 from nickaein/patch-1 
Fix typo in README.md
 2019-02-22 09:50:45 +01:00
Isaac Nickaein 088a245218
Fix typo in README.ME 
Fixes https://github.com/nlohmann/json/issues/1486.
 2019-02-22 01:05:00 +03:30
Niels Lohmann e326df211b
Merge pull request #1474 from nickaein/develop 
Implement contains() member function
 2019-02-13 13:05:21 +01:00
Niels Lohmann c55cacee1e
Merge pull request #1477 from nickaein/fix-doc 
Fix documentation
 2019-02-13 13:03:46 +01:00
Isaac Nickaein e93f305494 Add unit-test for contains() member function 2019-02-13 13:21:54 +03:30
Isaac Nickaein 6a5db00951 Implement contains() to check existence of a key 2019-02-13 13:21:54 +03:30
Isaac Nickaein fb5ceb26ac Fix documentation 
Remove two instance of duplicate paragraphs.
 2019-02-11 17:00:48 +03:30