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
2203 commits 11 branches 56 tags 222 MiB
Commit graph

2203 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann f80827d068
Merge pull request #873 from nlohmann/feature/issue872 
🚨 remove C4996 warnings #872
 2017-12-14 09:35:48 +01:00
Niels Lohmann a9a4ff61c6
🚨 remove C4996 warnings #872 
These were the remaining direct calls to alloc.
 2017-12-13 17:01:39 +01:00
Niels Lohmann f7ae143a93
Merge pull request #870 from nlohmann/feature/issue838 
💥 throwing an exception in case dump encounters a non-UTF-8 string #838
 2017-12-13 06:34:11 +01:00
Niels Lohmann 8419bfbbd2
✅ improved test coverage 
As we guarantee proper UTF-8 before, we do not need to cope with it later.
 2017-12-12 20:44:57 +01:00
Niels Lohmann 569d275f65
💥 throwing an exception in case dump encounters a non-UTF-8 string #838 
We had a lot of issues with failing roundtrips (i.e., parse errors from serializations) in case string were stored in the library that were not UTF-8 encoded. This PR adds an exception in this case.
 2017-12-11 22:38:05 +01:00
Niels Lohmann 383743c6c0
Merge pull request #868 from nlohmann/feature/issue867 
📝 fixing documentation #867
 2017-12-11 08:55:26 +01:00
Niels Lohmann 7de009edd1
✏️ fixing typos #869 2017-12-10 13:07:47 +01:00
Niels Lohmann 772bb3cc20
📝 fixing documentation #867 
The example in the documentation on how to "force" an array of arrays was wrong since the first release. Fixed the documentation and added checks for the README unit tests.
 2017-12-10 12:32:20 +01:00
Niels Lohmann 0693945230
Merge pull request #860 from bogemic/std_iterator_conformance_cpp17 
iter_impl template conformance with C++17
 2017-12-08 07:55:47 +01:00
Mike Bogdanov 64d6daa76e iter_impl template conformance with C++17 2017-12-07 11:30:17 +03:00
Niels Lohmann 7c2d4f1852
👷 added Xcode 9.1 and 9.2 2017-12-06 22:32:03 +01:00
Niels Lohmann 9e2f185ac6
💄 reformatted code after PRs 2017-12-06 22:21:11 +01:00
Niels Lohmann c5e731774a
Merge pull request #856 from bogemic/std_allocator_conformance_cpp17 
Std allocator conformance cpp17
 2017-12-06 21:52:52 +01:00
Niels Lohmann 25d205c16d
📝 clarified difference between serialization and string value retrieval #853 2017-12-06 21:42:36 +01:00
Niels Lohmann fa76f2efd7
Merge pull request #855 from theodelrieu/fix/cmake_include_directories 
cmake: use BUILD_INTERFACE/INSTALL_INTERFACE
 2017-12-06 20:47:38 +01:00
Mike Bogdanov 8890b935fd fixed merge conflicts 2017-12-06 12:24:50 +03:00
Mike Bogdanov daba1b6a0b fixed conformance with C++17, some members of allocator are depricated and should be used via allocator_traits 2017-12-06 11:20:42 +03:00
Niels Lohmann 0e3a0b730b
Merge pull request #854 from theodelrieu/fix/force_msvc_stacktrace 
to/from_json: add a MSVC-specific static_assert to force a stacktrace
 2017-12-05 19:36:31 +01:00
Théo DELRIEU 541ee62a05
cmake: use BUILD_INTERFACE/INSTALL_INTERFACE in target_include_directories 2017-12-05 11:27:03 +01:00
Théo DELRIEU c9a02cbc59
to/from_json: add a MSVC-specific static_assert to force a stacktrace 2017-12-05 10:52:55 +01:00
Niels Lohmann f4c01601fa
Merge pull request #844 from TinyTinni/develop 
Add .natvis for MSVC debug view
 2017-12-04 21:43:22 +01:00
Matthias Möller 24fe572d98 missing new line 2017-11-30 13:37:58 +01:00
Matthias Möller 8e9a8792a9 moved natis to root dir 2017-11-30 13:26:45 +01:00
Matthias Möller af775ddbb8 add compiler & cmake version check 2017-11-28 23:43:39 +01:00
Matthias Möller 48d7a32daa add .natvis for MSVC debug view 2017-11-26 10:31:33 +01:00
Matthias Möller 5b4855dea2 fix targetname 2017-11-26 10:29:51 +01:00
Niels Lohmann cc937deaf6
🚑 the last commit contained a bug #821 2017-11-26 10:15:23 +01:00
Niels Lohmann 430f03512c
🚨 fixed some warnings #821 2017-11-25 22:06:18 +01:00
Niels Lohmann ea5aed0769
Merge branch 'feature/to_array' into develop 2017-11-25 19:41:11 +01:00
Niels Lohmann de75cf89f7
✅ improved test coverage 2017-11-25 19:41:02 +01:00
Niels Lohmann 52ca35b2b0
Merge pull request #829 from jowr/patch-1 
Updated hunter package links
 2017-11-18 13:35:21 +01:00
Jorrit Wronski 7b8ddadd83
removed hunter badge 2017-11-16 21:01:27 +01:00
Jorrit Wronski b5ddd99adf
Updated hunter package links 2017-11-15 08:48:11 +01:00
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