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

2220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann 4c4f60f438
📝 fixes #820 2017-11-06 20:35:05 +01:00
Niels Lohmann 1af5601a2a
Merge pull request #811 from Itja/patch-1 
Typos README
 2017-10-31 18:23:42 +01:00
Itja e423aea64a
Typos README 
Hey, thanks for this great library which I've used in many occasions now. I know it's not much, but I wanted to contribute at least a tiny bit back to you by this PR :-) Keep up the good work!
 2017-10-31 16:31:14 +01:00
Niels Lohmann 5696660eba
🔨 another try to fix #714 
adding std::ios_base::binary when opening all_unicode.json.cbor
 2017-10-31 15:04:14 +01:00
Niels Lohmann c4d6626745
🚀 installed Request Info Bot 2017-10-30 16:04:34 +01:00
Niels Lohmann 6d2981db82
📝 overworked templates 2017-10-29 16:32:23 +01:00
Niels Lohmann 87df1d6708
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2017-10-29 11:55:04 +01:00
Niels Lohmann fa1425b87c
🚀 installed Sentiment Bot 2017-10-29 11:54:53 +01:00
Niels Lohmann 73d0095154
Merge pull request #807 from theodelrieu/fix/805 
add forwarding references to json_ref constructor
 2017-10-28 15:33:22 +02:00
Théo DELRIEU 4b46abf97c
add forwarding references to json_ref constructor 
fixes #805
 2017-10-28 14:22:57 +02:00
Niels Lohmann 8e067c0c3c
🔨 set bidirectional iterator tag #593 2017-10-28 09:41:35 +02:00
Niels Lohmann cea3f24ff9
📝 comment to address #561 2017-10-27 16:39:52 +02:00
Niels Lohmann 61cc07ff38
📝 some documentation 2017-10-27 16:07:04 +02:00
Niels Lohmann 734e2b73cf
🔨 cleanup 2017-10-27 11:49:24 +02:00
Niels Lohmann 7820b5eccb
📝 thanks for #795 2017-10-27 11:49:17 +02:00
Niels Lohmann 77f8e2f987 Merge pull request #795 from jseward/develop 
Add transparent comparator and perfect forwarding support to find() and count()
 2017-10-27 11:47:23 +02:00
Niels Lohmann c215b77936
🚀 installed Stale Bot 2017-10-25 11:37:33 +02:00
Jamie Seward 992c836b30 Add missing spaces 2017-10-24 00:14:25 -07:00
Jamie Seward 715c98b404 Remove extra spaces 2017-10-24 00:06:22 -07:00
Jamie Seward 6c9a401ebc Remove old non-perfect forwarding find and count 2017-10-24 00:01:56 -07:00
Jamie Seward 16ffdbcb20 Remove c++17 support flag in cmake 
Already covered by AppVeyor
 2017-10-23 23:50:06 -07:00
Jamie Seward 73b1629a15 Remove tabs for spaces 2017-10-23 23:45:39 -07:00
Niels Lohmann 1b1bd0e3e6
⏪ #714 is still not fixed 2017-10-23 12:01:50 +02:00
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
Niels Lohmann 89650c99dd
🚧 checking if #714 is now fixed with MSVC 
Hopefully, #764 fixed this.
 2017-10-22 11:16:33 +02:00
Niels Lohmann b0c380b0f8
📝 cleanup after the last PRs 2017-10-22 09:12:35 +02:00
Niels Lohmann be4fba7baf
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2017-10-22 08:53:46 +02:00
Niels Lohmann f193427e91
🔨 some simplifications 2017-10-22 08:53:43 +02:00
Niels Lohmann 24b6e028a9
✅ improved test coverage 2017-10-22 08:53:27 +02:00
Niels Lohmann 3094640446 Merge pull request #764 from pjkundert/develop-simplify-istream 
Simplified istream handing #367
 2017-10-22 08:52:28 +02:00
Niels Lohmann ef40673acb Merge branch 'develop' into develop-simplify-istream 2017-10-22 08:52:15 +02: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
Niels Lohmann 33df3250c3 Merge pull request #793 from sonulohani/develop 
Error : 'identifier "size_t" is undefined' in linux
 2017-10-21 10:58:27 +02:00
Sonu Lohani 92da334862 Error : 'identifier "size_t" is undefined' in linux 2017-10-21 12:52:44 +05:30
Niels Lohmann 2e281ba64b Merge pull request #788 from jseward/develop 
Fix Visual Studio 2017 warnings
 2017-10-18 15:04:24 +02:00
Jamie Seward a99fcb4e7d Add comments and newline 2017-10-17 22:53:35 -07:00
Jamie Seward 917d9d8bc3 Fix Visual Studio 2017 warnings 2017-10-16 23:23:55 -07:00
Niels Lohmann 7c8f0a4186 Merge pull request #785 from jseward/develop 
Fix warning C4706 on Visual Studio 2017 - fixes #784
 2017-10-16 19:48:17 +02:00
Niels Lohmann b27a142ec0 Merge pull request #783 from eld00d/patch-1 
Set GENERATE_TAGFILE in Doxyfile
 2017-10-16 17:54:28 +02:00
Perry Kundert a8cc7a1bc8 Consistently use std::char_traits int_type-->char conversion intrinsics 2017-10-16 08:06:10 -07:00
Jamie Seward af99090742 Disable warning C4389: '==': signed/unsigned mismatch 
Lots of tests have this warning.

Also moved out of for loop, doesn't need to be done every loop.
 2017-10-16 01:02:48 -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
Jamie Seward 19f8f1c075 Add missing "u8" 
This causes test-udt to crash due to bad iterator
 2017-10-16 00:21:38 -07:00
Jamie Seward 5ec44fe9e3 Add /W4 for MSVS 2017-10-15 22:56:38 -07:00
Nate Vargas 727ee7d03e Set GENERATE_TAGFILE in Doxyfile 
Allows documentation to be linked from other projects to https://nlohmann.github.io/json using Doxygen with the tag:
TAGFILES = $(SOME_PATH)/nlohmann_json.tag=https://nlohmann.github.io/json
 2017-10-14 19:06:38 -05:00
Niels Lohmann d300a8e268
🚨 fixed warnings #776 2017-10-13 08:46:29 +02:00
Perry Kundert 0b803d0a5f Simplify the json/src/benchmarks.cpp to allow more optimal code gen. 
o For some unknown reason, the complexity of the benchmark platform
  prevented some C++ compilers from generating optimal code, properly
  reflective of the real performance in actual deployment.
o Added the json_benchmarks_simple target, which performs the same
  suite of tests as json_benchmarks.
o Simplified the benchmark platform, and emit an "Average" TPS
  (Transactions Per Second) value reflective of aggregate parse/output
  performance.
 2017-10-07 15:50:19 -07:00