j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2872 commits 1 branch 0 tags 274 MiB
Commit graph

2872 commits

This branch
This branch
All branches
Author SHA1 Message Date
Théo DELRIEU
5bffc95773
add json_fwd.hpp 2018-01-08 20:08:38 +01:00
Niels Lohmann
3d7658da89
🚧 working on AppVeyor's errors 2018-01-08 19:48:18 +01:00
Niels Lohmann
126ce2e56c
🚧 further UBJSON 2018-01-08 18:54:17 +01:00
Niels Lohmann
c9938ea838
🚧 started UBJSON implementation 2018-01-07 22:09:12 +01:00
Niels Lohmann
15b6421d07
✅ added UTF-8 decoder capability and stress test 
As described in http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt; Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> - 2015-08-28 - CC BY 4.0
 2018-01-05 23:26:22 +01:00
Niels Lohmann
78f8f837e6
added items() function #874 2018-01-05 18:34:10 +01:00
Niels Lohmann
96b40b27a5
📝 fixed Doxygen warnings 
Apparently, using "\n" inside an alias is an error now, but "^^" basically means the same.
 2018-01-05 18:33:42 +01:00
Niels Lohmann
337e9824ea
Merge pull request #900 from Dobiasd/patch-1 
fix link to the documentation of the emplace function
 2018-01-04 17:11:18 +01:00
Tobias Hermann
ba2316372a
fix link to the documentation of the emplace function 2018-01-03 11:06:32 +01:00
Niels Lohmann
ce1dccf347
Merge branch 'release/3.0.1' into develop 2017-12-29 20:24:49 +01:00
Niels Lohmann
92484f0caf
🔖 set version to 3.0.1 2017-12-29 18:31:13 +01:00
Niels Lohmann
ebc6849b71
✅ added test for #894 2017-12-29 16:53:04 +01:00
Niels Lohmann
3c76ff353d
📝 updated docs after PRs 2017-12-29 16:52:09 +01:00
Niels Lohmann
d45183d426
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2017-12-28 13:52:26 +01:00
Niels Lohmann
3b3b6e8e69
🚑 fix for #894 
- Implemented "copy" in terms of "add".
- Added check for JSON Pointer array indices to make sure the complete reference token was processed.
- Added test suite from https://github.com/json-patch/json-patch-tests
 2017-12-28 13:52:23 +01:00
Niels Lohmann
f28fc2261a
Merge pull request #858 from mattismyname/develop 
🔧 Fix up a few more effc++ items
 2017-12-28 12:13:19 +01:00
Matthew K. Gumbel
72bff90ed9 🔧 Fix up a few more effc++ items 2017-12-24 10:03:36 -08:00
Niels Lohmann
3113a52a7d
📝 added exception 403 to documentation of at (#888) 
The at function throws json::out_of_range.403 when a nonexistent object key is provided (just like the usual at function). This was not documented and users could assume json::out_of_range.404 would be thrown instead.

- Updated documentation.
- Added example code.
 2017-12-23 18:38:18 +01:00
Niels Lohmann
184e9c6aa7
Merge pull request #885 from TinyTinni/develop 
Includes CTest module/adds BUILD_TESTING option
 2017-12-23 11:09:46 +01:00
Matthias Möller
d1cda6888e includes CTest module resp. BUILD_TESTING option 2017-12-20 17:54:45 +01:00
Niels Lohmann
88ddb12afc
📝 fix for #883 
- Adjusted table to user-defined exceptions. This was forgotten in the 3.0.0 update.
- Added update function to the table.
 2017-12-18 19:46:53 +01:00
Niels Lohmann
e54b6ace94
Merge pull request #882 from erengy/fix-msvc-c4819 
Fix MSVC warning C4819
 2017-12-17 19:52:57 +01:00
Eren Okka
ab0e8b2f3a
Fix MSVC warning C4819 
Replaces a U+00A0 character with regular space, and fixes a typo.
 2017-12-17 18:02:55 +03:00
Niels Lohmann
1ca6ec1dc0
Merge pull request #880 from nlohmann/coverity_scan 
Merge branch 'develop' into coverity_scan
 2017-12-17 11:24:40 +01:00
Niels Lohmann
1856f38c85
📝 removed paragraph on version 3.0.0 2017-12-17 11:22:35 +01:00
Niels Lohmann
afebb6a3bb
Merge branch 'release/3.0.0' into develop 2017-12-17 11:04:53 +01:00
Niels Lohmann
106f9f5436
⬆️ updated git-update-ghpages script 2017-12-17 10:20:30 +01:00
Niels Lohmann
9eb5e2c271
🔖 set version to 3.0.0 2017-12-17 08:40:19 +01:00
Niels Lohmann
9e3c4ad11f
🔖 set version to 3.0.0 2017-12-17 08:31:18 +01:00
Niels Lohmann
314e4e7699
📝 improved documentation for dump and iterator_wrapper 2017-12-16 23:58:10 +01:00
Niels Lohmann
9a51fb4da2
🚨 fixed some warnings 2017-12-16 22:19:30 +01:00
Niels Lohmann
7bf007f2bc
Merge pull request #879 from nlohmann/feature/algorithms 
✅ re-added tests for algorithms
 2017-12-16 12:41:07 +01:00
Niels Lohmann
980795b644
✏️ fixed typos 2017-12-16 12:37:44 +01:00
Niels Lohmann
f3bd755cab
➖ removing <iomanip> header 2017-12-16 12:37:25 +01:00
Niels Lohmann
4c871c58f8
✅ re-added tests for algorithms 2017-12-16 11:16:34 +01:00
Niels Lohmann
c23f5dcea6
📝 fixed year 2017-12-15 23:49:37 +01:00
Niels Lohmann
2e1b1061cd
Merge pull request #875 from nlohmann/feature/spelling 
Overworked library toward 3.0.0 release
 2017-12-14 22:31:19 +01:00
Niels Lohmann
261caec2de
👥 added contributor image 2017-12-14 22:29:39 +01:00
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
9a70c60fa5
Revert "⬆️ updated to Catch 2.0.1" 
This reverts commit 920f64c01c.
 2017-12-14 07:49:16 +01:00
Niels Lohmann
fb8482db76
👌 fixed some issues from the last commit #875 2017-12-13 23:44:53 +01:00
Niels Lohmann
c6e7eae394
✨ implemented JSON Merge Patch (RFC 7396) 
SQLite's json1 extension (https://www.sqlite.org/json1.html) supports JSON Merge Patch (https://tools.ietf.org/html/rfc7396). As the implementation is trivial and we already support JSON Patch, I think this could be a nice extension to the library.
 2017-12-13 23:36:22 +01:00
Niels Lohmann
920f64c01c
⬆️ updated to Catch 2.0.1 
Update required all CHECK_THROWS_AS macros to pass the exception type without reference, because this is now done by Catch2.
 2017-12-13 22:18:05 +01:00
Niels Lohmann
293748a9a9
📝 overworked README 
- Added recent contributors to thanks list.
- Linked PGP key for private mails.
- Updated compiler list.
 2017-12-13 22:17:02 +01:00
Niels Lohmann
e8d9963abe
👌 cosmetic changes and overworked spelling 
- All hex literals use upper case letters after the x.
- Fixed sime typos.
- Documented some more functions.
 2017-12-13 22:15:53 +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