haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
2123 commits 11 branches 56 tags 222 MiB
Commit graph

933 commits

Author SHA1 Message Date
Jamie Seward 33c6511dd0 Remove JSON_HAS_STRING_VIEW 
Instead implement @gregmarr's PR comments that perfect forwarding should be used. Also cleaned up cpp language standard detection.
 2017-10-23 00:43:26 -07:00
Jamie Seward d468f8c4e6 Use consistent logic to determine if string_view exists 2017-10-21 16:36:05 -07:00
Jamie Seward 59cde1ad6e Fix for _HAS_CXX17 == 0 
Copied from solution to https://github.com/nlohmann/json/issues/464
 2017-10-21 16:29:37 -07:00
Jamie Seward 1a66679929 Add string_view support 
This avoids unnecessary string copies on often used
find().
 2017-10-21 15:20:13 -07:00
Sonu Lohani 92da334862 Error : 'identifier "size_t" is undefined' in linux 2017-10-21 12:52:44 +05:30
Jamie Seward 917d9d8bc3 Fix Visual Studio 2017 warnings 2017-10-16 23:23:55 -07:00
Jamie Seward 8ba7f69ab4 Fix whitespace 2017-10-16 00:49:59 -07:00
Jamie Seward 8a4af820c7 Fix warning C4706 2017-10-16 00:41:58 -07:00
Niels Lohmann d300a8e268
🚨 fixed warnings #776 2017-10-13 08:46:29 +02:00
Niels Lohmann 5cb6d7187d
🚨 fixing last warning in #755 2017-10-04 17:28:35 +02:00
Niels Lohmann 54bd1b5124
Merge branch 'develop' into feature/issue698 2017-10-03 17:23:05 +02:00
Niels Lohmann 7435d54e97
🔨 clean up 2017-10-02 23:06:41 +02:00
Niels Lohmann 4912231450
Merge branch 'develop' into feature/issue698 2017-10-02 18:25:25 +02:00
Niels Lohmann b91805e1f0
🚨 removing a compiler warning #755 2017-10-02 18:11:36 +02:00
Niels Lohmann f89f8b2d0b
Merge branch 'develop' into feature/issue698 2017-10-02 17:47:53 +02:00
Niels Lohmann 8be303d4fb
🏁 fixing a min() call for MSVC #762 2017-10-02 13:54:14 +02:00
Niels Lohmann 1df836ce40
⏪ removed call to std::signbit #761 2017-10-01 15:48:29 +02:00
Niels Lohmann 8af49d4be5
🚨 removing compiler warnings #755 2017-09-30 11:00:26 +02:00
Niels Lohmann 1a66527dca
📝 fixed documentation #745 2017-09-30 10:18:18 +02:00
Niels Lohmann 295d65ada7
Merge branch 'develop' into feature/issue698 2017-09-10 01:13:43 +02:00
Niels Lohmann fcba9ec537
🔨 clean up 2017-09-10 01:12:03 +02:00
Niels Lohmann 31ce7e1e59
Merge branch 'develop' into feature/issue698 2017-09-09 11:05:20 +02:00
Niels Lohmann c607b5c2ac
📝 improved documentation 2017-09-06 17:14:06 +02:00
Niels Lohmann 91e0032853
📝 improved documentation 2017-08-29 23:46:26 +02:00
Niels Lohmann 15e757c42b
🔨 trying to fix memory issue with valarray 2017-08-27 10:41:39 +02:00
Théo DELRIEU bb1b4c934e
fix from_json implementation for pair/tuple 
Introduced by 6e4910d5c5

Fixes #707
 2017-08-23 10:05:43 +02:00
Niels Lohmann 0b5e8f859b
🔨 cleanup 
Fixed some warning in Clion.
 2017-08-23 00:42:15 +02:00
Niels Lohmann 9fd031b6f4
🐛 re-added support for std::valarray #702 2017-08-22 23:28:23 +02:00
Niels Lohmann 64ef100ebf
Revert "💥 changed iterators to andom_access_iterator #593" 
This reverts commit c77a0be5f3.
 2017-08-20 20:44:44 +02:00
Niels Lohmann c77a0be5f3
💥 changed iterators to andom_access_iterator #593 
This commit changes the iterator category to andom_access_iterator and allows offsets and subscript operators for object iterators.
 2017-08-16 21:35:22 +02:00
Niels Lohmann aba8b58492
🔨 approach to un-break the changes for #462 2017-08-16 20:11:05 +02:00
Niels Lohmann 22b59693f1
💥 CBOR/MessagePack input must end with EOF #505 
The CBOR and MessagePack parsers now expect the input to be read until the end. Unless the new parameter "strict" is set to false (it is true by default), an exception is raised if the parser ends prematurely. This is a breaking change as the parsers ignored unread input so far.

Furthermore, the offset/startIndex paramter introduced in #462 was removed as this behavior can be mimicked with an iterator range. For instance, instead of calling "from_cbor(vec, 5);", you can write "from_cbor({vec.begin()+5, vec.end()});".
 2017-08-16 14:48:23 +02:00
Niels Lohmann 4391bf5615
Merge branch 'feature/update' into develop 2017-08-16 07:39:30 +02:00
Niels Lohmann 1e360bb32b
🔨 preparation for #505 
Added a parameter to control whether parsing CBOR and MessagePack must completely consume the input.
 2017-08-16 07:39:11 +02:00
Niels Lohmann 72afe53fa0
📝 updated documentation for update() function #661 2017-08-15 21:42:50 +02:00
Niels Lohmann 039e2f03bc
Merge branch 'develop' into feature/update 2017-08-15 19:54:22 +02:00
Niels Lohmann 08805f7f14
🔨 cleanup 2017-08-13 20:57:27 +02:00
Niels Lohmann 7d19aed567
🔨 cleanup 2017-08-13 19:02:58 +02:00
Niels Lohmann 6151b056eb
🔨 cleanup 2017-08-10 23:40:30 +02:00
Niels Lohmann a46afd4008 Merge pull request #679 from traits/patch-1 
Digraph warning
 2017-08-10 11:39:13 +02:00
traits 54c67dcfec Update json.hpp 2017-08-10 09:05:00 +02:00
WebProdPP c9509ccf97 Update json.hpp 
mistake
 2017-08-09 16:13:43 +03:00
Kyle Thompson 4b55f0ebd6 To fix compilation issue for intel OSX compiler 
o To prevent the compilation issue on OSX with the intel compiler suite.  The
error was found with icpc version 15.0.3.187 where the "__clang_version__" was
not defined correctly, while "__clang__" was.
 2017-08-08 18:43:03 -04:00
traits ab44a50d98 Digraph warning 
The original version can trigger a digraph-related warning in VS2015. Is this namespace construct a typo or something deliberate?
 2017-08-07 14:23:48 +02:00
DmitryKuk 19437c15de massage -> message 2017-08-05 10:43:08 +03:00
Niels Lohmann d2c3592908
✅ added test cases for update #661 2017-08-02 22:44:58 +02:00
Niels Lohmann d1e13d5128
🎉 first draft for #661 2017-08-02 22:12:41 +02:00
Niels Lohmann 0ea0d7d860 Merge pull request #674 from wincent/patch-1 
Fix "not constraint" grammar in docs
 2017-08-01 20:21:04 +02:00
Niels Lohmann efdfd3aa5b
⚡ replaced by-value call #673 2017-08-01 19:37:25 +02:00
Greg Hurrell 391303521a Fix "not constraint" grammar in docs 2017-08-01 08:56:28 -07:00