1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-13 20:21:48 +03:00
Commit Graph

347 Commits

Author SHA1 Message Date
8f9f561742 Merge branch 'feature/detect_unsupported_compilers' into develop
- added error macros to exclude unsupported compilers
2016-07-01 17:42:36 +02:00
513fac589b Merge branch 'feature/algorithm_loops' into develop
- replaces some raw loops by std algorithms
- used std::advance where possible
2016-07-01 17:39:25 +02:00
bd7cd330cd fixed type_name() signature 2016-07-01 17:26:09 +02:00
6e1347e68c fixes #270 2016-07-01 16:58:50 +02:00
52cbda8048 using std::advance where possible 2016-06-29 12:47:29 +02:00
a0609b2da3 fixed coverage bug 2016-06-29 09:53:48 +02:00
924f78119b math... 2016-06-29 09:34:14 +02:00
7cb8ee42d5 wrong GCC version 2016-06-29 09:22:28 +02:00
d456dec320 overlapping defines 2016-06-29 09:16:18 +02:00
fc7f4b8fba replace some raw loops with algorithms 2016-06-28 22:49:05 +02:00
dc479b3f9d check for unsupported compilers 2016-06-28 22:09:22 +02:00
d2475f9010 bumped version number 2016-06-28 21:44:03 +02:00
7214243d89 reset locale (for #272) 2016-06-28 19:18:23 +02:00
420659f187 addressing #272 2016-06-28 10:42:17 +02:00
04a80a8f60 Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-23 05:57:41 +02:00
59e67e768f fix for previous commit 2016-06-22 20:09:06 +02:00
3f97a5d5ad a conceptual quick fix for #269 2016-06-22 20:05:44 +02:00
ad7a419a03 removed roundtripping of floats (#230) 2016-06-19 17:13:13 +02:00
4e31a0e852 minor doc changes 2016-06-19 16:17:53 +02:00
fb90388af5 Fix Issue #265 2016-06-14 09:59:50 +01:00
494cc15650 Merge branch 'develop' into feature/issue260 2016-06-07 12:13:03 +02:00
9e2dfd19e8 minor cleanup 2016-06-07 00:20:53 +02:00
b508d1f1c4 fix proposal for #260 2016-06-06 18:50:39 +02:00
0a393b8374 indentation cleanup 2016-05-12 07:34:36 +02:00
0e0ecb2c14 fixed a warning and update ChangeLog 2016-05-12 00:32:18 +02:00
f1e61896fb fixed a shadow error 2016-05-11 18:43:12 +02:00
91aa4c9def Merge branch 'develop' into feature/issue239 2016-05-11 17:23:01 +02:00
9ecf83f630 working on #235 2016-05-08 20:28:20 +02:00
6d8e00ade8 another try to remove a warning 2016-05-08 17:17:17 +02:00
ac3036dc0f Merge branch 'develop' into feature/issue239 2016-05-08 17:07:08 +02:00
85a30813c8 removed unnecessary code (numbers must not begin with "+") 2016-05-07 20:22:58 +02:00
c04275966f improved test coverage 2016-05-07 18:33:43 +02:00
9073b2ca39 hopefully removed some warnings 2016-04-30 16:22:27 +02:00
1d3b4dd158 added test cases 2016-04-30 00:03:47 +02:00
62f81a60d7 hopefully fixed a warning 2016-04-29 21:23:13 +02:00
5e0bf75d60 cleanup, test, and diff 2016-04-25 23:17:04 +02:00
96cfe7463f fixed some warnings 2016-04-24 19:09:12 +02:00
8d4cf5ef8d oops 2016-04-24 19:04:10 +02:00
fb54e212b6 clean up and added tests 2016-04-24 19:03:33 +02:00
09e9f6dcd4 implemented "move" 2016-04-24 17:43:27 +02:00
855cf2307b extended "add" to cope with arrays 2016-04-24 16:51:06 +02:00
397ada22d3 implemented remove 2016-04-20 16:52:00 +02:00
fa03cf0c63 replace and copy 2016-04-20 15:41:33 +02:00
70fc5835cb started implementing JSON Patch (RFC 6902) 2016-04-18 22:41:36 +02:00
3ca1bfdd9d made a function static 2016-04-17 23:41:52 +02:00
08c97df420 added examples 2016-04-17 23:18:07 +02:00
1dee40a969 fixed test case 2016-04-17 22:34:39 +02:00
6268287940 improved documentation and test coverage 2016-04-17 22:08:21 +02:00
0835eb293f improved RFC compliance and code coverage 2016-04-17 18:54:54 +02:00
f883a04c87 more documentation 2016-04-17 18:18:49 +02:00