Commit Graph
100 Commits
Author SHA1 Message Date
Niels 0f64761663 Merge pull request #238 from robertmrk/cmake-package
Implement additional integration options
2016-04-26 20:31:19 +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
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
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
Niels 2f63e5fb45 added copyright information to files to make release more self-contained 2016-03-25 17:41:36 +01:00
Niels c6a6a024f7 fixes #214 2016-03-06 20:03:05 +01:00
Niels 10a884473e fixed #217 2016-03-04 07:30:08 +01:00
Niels 8ee3d24046 Merge pull request #218 from Annihil/master
Corrected readme
2016-03-04 07:26:27 +01:00
Niels 53879f9c99 cleanup 2016-02-21 08:17:11 +01:00
Niels 502cedf70b Merge pull request #213 from whackashoe/patch-1
Create PULL_REQUEST_TEMPLATE.md
2016-02-21 08:15:46 +01:00
Niels f965c4c35b improved code coverage 2016-02-14 22:56:51 +01:00
Niels d869b0a387 updated online documentation 2016-02-14 22:28:56 +01:00
Niels 3a92559fa9 cleanup 2016-02-14 22:24:45 +01:00
Niels 09654b3104 Merge pull request #208 from nlohmann/noexcept
fixed noexcept; added constexpr
2016-02-14 22:18:39 +01:00
Niels f160f33fb5 update from master 2016-02-14 21:44:00 +01:00
Niels 7f4736b546 added serialization to fuzz testing 2016-02-14 21:36:56 +01:00
Niels a3eecdc383 updated Catch to v1.3.4 2016-02-14 21:36:43 +01:00
Niels 153e105164 cleanup after #207 2016-02-14 18:38:29 +01:00
Niels ec098ffcc2 Merge pull request #207 from msm-/afl-fuzz
add support for afl-fuzz testing
2016-02-14 17:24:54 +01:00
Niels 49dc2dff68 fixed error when compiled with Clang 2016-02-14 16:58:24 +01:00
Niels 836fdfedf2 fixed an error in MSVC 2016-02-14 16:53:32 +01:00
Niels a69b1a6f0b added noexcept and constexpr 2016-02-14 16:42:48 +01:00
Niels 61fe90f998 Merge pull request #205 from nlohmann/issue204
replaced ssize_t occurrences with auto (fixes #204)
2016-02-10 21:41:55 +01:00
Niels a831c787df try to replace std::ptrdiff_t with auto (for #204) 2016-02-10 21:19:31 +01:00
Niels 4cc4b26dd2 try to replace ssize_t occurrences with std::ptrdiff_t (for #204) 2016-02-10 21:09:52 +01:00
Niels 1cc4717582 tried Clang 3.9 2016-02-09 21:26:40 +01:00
Niels be20555985 removed gitter 2016-02-07 17:24:51 +01:00
Niels 236b7afff5 updated and fixed online version 2016-02-07 15:07:17 +01:00
Niels fdfb39d949 improved documentation 2016-02-07 14:55:29 +01:00
Niels 3b776c08c7 clarified documentation 2016-02-07 10:45:52 +01:00
Niels 8b1a777d36 reverted change wrt. Erasable concept 2016-02-05 22:37:28 +01:00
Niels 2ff2e10660 checking Erasable concept 2016-02-05 22:30:37 +01:00
Niels ae5bd307a2 improved documentation 2016-02-05 22:30:25 +01:00
Niels 2c720b26ab added a constructor from an input stream 2016-02-05 19:24:42 +01:00
Niels 104c4b5286 improve code coverage 2016-01-31 15:04:38 +01:00
Niels 6aa881988d improved documentation 2016-01-31 13:05:39 +01:00
Niels 22127a4b85 moved documentation to index markdown file 2016-01-30 22:05:01 +01:00
Niels 740239cef8 added a note about GCC 4.8 (#163) 2016-01-30 21:17:08 +01:00
Niels 36719fdb18 using re2c 0.16 (minimized automaton) 2016-01-30 20:33:31 +01:00
Niels 9d063d90e3 removed "using namespace" from examples 2016-01-30 20:23:14 +01:00
Niels ade2f7c92d updated ChangeLog 2016-01-30 16:51:53 +01:00
Niels 2224435f9b cleanup after #200 2016-01-30 13:36:15 +01:00
Niels cd44e43457 Merge pull request #200 from twelsby/issue199
Fixed issue #199 - Small bugs in json.hpp (get_number) and unit.cpp (non-standard integer type test)
2016-01-30 13:32:22 +01:00
Niels ff6f723195 removed token 2016-01-26 23:30:51 +01:00
Niels 3dfa56795f added note 2016-01-26 23:27:07 +01:00
Niels 1c80c2231f linked releases in ChangeLog 2016-01-26 23:10:52 +01:00
Niels 89b07bd3af added (generated) changelog 2016-01-26 22:59:57 +01:00
Niels 91c58a77a1 added Gitter to Travis 2016-01-26 21:49:20 +01:00
Niels fb239fe645 trying Gitter 2016-01-26 21:42:51 +01:00
Niels 2468631dc9 overworked examples 2016-01-26 20:07:03 +01:00
Niels 707732a53e clean up after #193 2016-01-26 19:50:49 +01:00
Niels e46cc6327f Merge pull request #193 from twelsby/issue178
Issue #178 - Extending support to full uint64_t/int64_t range and unsigned type (updated)
2016-01-26 19:40:16 +01:00
Niels d338042e3e added note to warn about floating-point exceptions (#181) 2016-01-26 19:21:46 +01:00
Niels 11ae1d0f09 cleanup after #196 2016-01-26 19:13:03 +01:00
Niels 077fb1d540 Merge pull request #196 from twelsby/issue195
Issue #195 - update Travis to Trusty due to gcc/clang strtod() bug
2016-01-26 19:12:36 +01:00
Niels b630ce0e78 thanks 2016-01-26 19:11:58 +01:00
Niels 8deaabb289 Merge pull request #197 from m-click/fix_broken_link
Fix broken link
2016-01-26 19:10:46 +01:00
Niels 2b13711009 updated online version 2016-01-24 23:02:28 +01:00
Niels c09d03fba7 fixed documentation 2016-01-24 22:43:00 +01:00
Niels 31093694ce fixed version number 2016-01-24 22:21:27 +01:00
Niels aee99b362d some editing 2016-01-24 19:24:06 +01:00
Niels 54a4139157 cleanup after #191 2016-01-24 17:33:46 +01:00
Niels ad5d1dabb2 Merge pull request #191 from twelsby/issue186
Fixed Issue #186 - add strto(f|d|ld) overload wrappers, "-0.0" special case and FP trailing zero
2016-01-24 17:21:22 +01:00
Niels 9584a99a43 added issue stats 2016-01-24 17:06:36 +01:00
Niels dfb01c659b added more comments 2016-01-24 16:42:45 +01:00
Niels 3245a0dc06 fixed #194 2016-01-24 16:42:13 +01:00
Niels 8b6e0dc02d small addition 2016-01-24 13:28:16 +01:00
Niels d7d1e55648 applied include-what-you-use 2016-01-24 13:28:08 +01:00