haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-08-24 05:52:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
1105 commits 13 branches 56 tags 228 MiB
Commit graph

1105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robert Marki 28f73ed406 Refactor CMake listfile to define an interface imported library 
Define the library as an interface imported library so other targets
can use the library as a dependency and use the interface properties
of the library.
 2016-04-24 19:56:20 +02:00
Niels 96cfe7463f fixed some warnings 2016-04-24 19:09:12 +02:00
Niels 8d4cf5ef8d oops 2016-04-24 19:04:10 +02:00
Niels fb54e212b6 clean up and added tests 2016-04-24 19:03:33 +02:00
Niels 09e9f6dcd4 implemented "move" 2016-04-24 17:43:27 +02:00
Niels 855cf2307b extended "add" to cope with arrays 2016-04-24 16:51:06 +02:00
Niels 397ada22d3 implemented remove 2016-04-20 16:52:00 +02:00
Niels fa03cf0c63 replace and copy 2016-04-20 15:41:33 +02:00
Niels 70fc5835cb started implementing JSON Patch (RFC 6902) 2016-04-18 22:41:36 +02:00
Niels 3ca1bfdd9d made a function static 2016-04-17 23:41:52 +02:00
Niels f4107d0d9c updated documentation 2016-04-17 23:36:37 +02:00
Niels 9f8da4c650 Merge branch 'feature/json-pointer' into develop 2016-04-17 23:23:34 +02:00
Niels 08c97df420 added examples 2016-04-17 23:18:07 +02:00
Niels 1dee40a969 fixed test case 2016-04-17 22:34:39 +02:00
Niels 6268287940 improved documentation and test coverage 2016-04-17 22:08:21 +02:00
Niels 7034ae2486 improved test coverage 2016-04-17 19:12:12 +02:00
Niels 0835eb293f improved RFC compliance and code coverage 2016-04-17 18:54:54 +02:00
Niels f883a04c87 more documentation 2016-04-17 18:18:49 +02:00
Niels 40e899a819 cleanup and documentation 2016-04-17 17:39:35 +02:00
Niels f834965b44 implemented deflatten function 2016-04-16 20:45:40 +02:00
Niels 007359675b added a flatten function 2016-04-16 16:39:20 +02:00
Niels 3401954f5b cleaned up API 2016-04-16 14:02:14 +02:00
Niels 3a3e064287 Merge branch 'develop' into feature/json-pointer 2016-04-16 12:19:31 +02:00
Niels 76a5a776eb cleanup after #234 2016-04-16 12:19:10 +02:00
Niels 6f0053a254 Merge branch 'support-move-iterators' of https://github.com/robertmrk/json into develop 2016-04-16 12:12:16 +02:00
Niels 94af8abdff overworked reference token parsing 2016-04-13 23:23:54 +02:00
Niels 2cb925c186 adding support for escaped reference tokens 2016-04-13 17:41:19 +02:00
Robert Marki 2197f5f0a6 Make the indirection and dereference operators of iterator const 
fixes #233
 2016-04-13 13:49:53 +02:00
Niels 726051e9b7 very first draft of a JSON pointer API 2016-04-11 23:17:03 +02:00
Niels 507322e6f2 updated ChangeLog 2016-04-10 19:36:09 +02:00
Niels 15f8c848fa fixed typo and indentation 2016-04-10 18:23:43 +02:00
Niels 170b70f082 Merge pull request #232 from nlohmann/issue228 
make serialization locale-independent (fixes #228)
 2016-04-07 17:16:58 +02:00
Niels a744c62696 made tests independent of "C" locale 2016-04-05 22:28:27 +02:00
Niels 0b60d970e9 make code independent of concrete locale 2016-04-05 22:12:12 +02:00
Niels 31bccc83b9 fixed locale problems 2016-04-05 21:55:51 +02:00
Niels 43ee70cef8 revert changes to master 2016-04-05 20:47:47 +02:00
Niels 44a8e9bf35 locale-independent dump 2016-04-03 16:33:30 +02:00
Niels 9c233be567 merged #201 2016-04-03 14:08:38 +02:00
Niels 04edafbddc Merge pull request #227 from kevin--/kevin--/noexcept_documentation 
fixes #223 by updating README.md
 2016-03-30 20:21:35 +02:00
Niels 1baa5a7350 fixed #225 2016-03-30 20:18:34 +02:00
Niels 0951a1f94c Merge pull request #222 from Teemperor/fixAndroid 
Added missing cerrno header to fix ERANGE compile error on android
 2016-03-30 20:12:55 +02:00
Niels 96443b0b97 added more thanks to the README file 2016-03-30 19:47:08 +02:00
Niels 27530c7840 better notes for Android (manually closes #215) 2016-03-30 19:42:54 +02:00
Niels 888635b749 cleanup after PR #212 and PR #226 2016-03-30 19:23:11 +02:00
Kevin Dixon 3df5337e79 fixes #223 by updating README.md 2016-03-29 21:41:46 -07:00
Niels 54d3cab568 Merge pull request #226 from lv-zheng/fix_int64 
Use namespace std for int64_t and uint64_t
 2016-03-29 10:35:24 +02:00
Lv Zheng 3e76e61b9c Use namespace std for int64_t and uint64_t 
According to the c++11 standard, the declarations are within namespace
scope of the namespace `std'. Add `std::' to avoid unnecessary
requirement of implementations.
 2016-03-28 18:11:12 +08:00
Niels 2f63e5fb45 added copyright information to files to make release more self-contained 2016-03-25 17:41:36 +01:00
Raphael Isemann fbc25b080b Added missing cerrno header to fix ERANGE c-error on android 2016-03-10 08:46:26 +01:00
Niels c6a6a024f7 fixes #214 2016-03-06 20:03:05 +01:00