mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-29 00:27:52 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
1,099 Commits 14 Branches 56 Tags 288 MiB
15925469c6
Commit Graph

1099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels
9e67dc46fa Merge branch 'release/v2.0.2' into develop 2016-07-31 13:37:49 +02:00
Niels
a05df038cd prepared release 2016-07-31 13:37:04 +02:00
Niels
9e51c9041e replaced individual assertions by a class invariant function 2016-07-30 18:02:41 +02:00
Niels
891918a30f cleanup and documentation 2016-07-30 16:12:10 +02:00
Niels
5405ae8601 added default value 2016-07-30 10:50:53 +02:00
Niels
b145e0c404 more cleanup 2016-07-29 23:47:16 +02:00
Niels
b2b68a0fa1 header + cleanup 2016-07-29 22:24:47 +02:00
Niels
161c74a92e some cleanup 2016-07-28 21:19:56 +02:00
Niels
6297631e22 reverted breaking changes 2016-07-27 21:40:15 +02:00
Niels
a7f8c47f68 cleaned up code 
- removed unnecessary assertions
- simplified simple if/return patterns
 2016-07-27 21:29:55 +02:00
Niels
bdaade91f5 fixed some errors in the README gif 2016-07-27 17:07:00 +02:00
Niels
5e88c6f254 more on travis 2016-07-25 23:41:16 +02:00
Niels
cc8102f0c4 used the wrong variable 2016-07-25 22:19:49 +02:00
Niels
fd7c7be851 fixed bash errors 2016-07-25 19:38:51 +02:00
Niels
148fed1e63 minor change 2016-07-25 18:06:59 +02:00
Niels
02fc3cddee test homebrew on OSX 2016-07-25 16:48:26 +02:00
Niels
a01ec918ac minor changes 2016-07-25 16:21:15 +02:00
Niels
d08e013dd0 improved documentation 2016-07-25 16:06:13 +02:00
Niels
369671f028 added more Unicode tests 2016-07-25 16:05:58 +02:00
Niels
dcea3a283c Merge branch 'feature/issue283' into develop (fixes #278) 2016-07-24 11:16:47 +02:00
Niels
84673b7de3 added test case from issue #283 2016-07-24 11:08:39 +02:00
Niels
e2aa2d2189 improved test coverage 2016-07-24 11:01:47 +02:00
Niels
75dbbc55cf started to implement #283 2016-07-23 09:59:09 +02:00
Niels
ddfe86cc49 fixed a bug that was found in the discussion of #274 2016-07-22 21:40:58 +02:00
Niels
51a3829680 reverted change to constexpr get_ref (does not work with GCC and MSVC) 2016-07-22 15:53:38 +02:00
Niels
4e7501e59a minor changes 
- fixed a bug that did not discard strings with control characters
between 0x10 and 0x1f
- added termination proofs for two important loops
- made get_ref() constexpr
 2016-07-22 15:34:45 +02:00
Niels
4c98c971b8 added benchmarks for numbers 2016-07-20 23:06:45 +02:00
Niels
1286d35767 make sure precision is reset on output streams during serialization 2016-07-20 20:07:45 +02:00
Niels
cb145cfe71 updated Changelog 2016-07-19 22:43:56 +02:00
Niels
0f834056bb removed unused header 2016-07-19 22:17:43 +02:00
Niels
2478be807c avoid recursion in the scanner 2016-07-19 22:10:27 +02:00
Niels
b64367e2f7 fix for #279 2016-07-18 16:22:10 +02:00
Niels
7f4dd5d608 added header for int64_t and uint64_t (fixes #282) 2016-07-15 19:44:19 +02:00
Niels
8116413106 Merge pull request #279 from murinicanor/patch-1 
let the makefile choose the correct sed
 2016-07-10 00:32:32 +02:00
Muri Nicanor
01f9ee5fd7 let the makefile choose the correct sed 2016-07-09 20:02:41 +02:00
Niels
98d48ef0c2 fixed indentation 2016-07-04 00:04:22 +02:00
Niels
71d20db4fc Merge branch 'feature/improved_documentation' into develop 
- improved documentation
 2016-07-01 18:02:37 +02:00
Niels
c6d45c30d5 Merge branch 'feature/parser_performance' into develop 
- improved parser performance by avoiding a copy of the result value
 2016-07-01 17:44:27 +02:00
Niels
8f9f561742 Merge branch 'feature/detect_unsupported_compilers' into develop 
- added error macros to exclude unsupported compilers
 2016-07-01 17:42:36 +02:00
Niels
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
Niels
bd7cd330cd fixed type_name() signature 2016-07-01 17:26:09 +02:00
Niels
28644bada0 removed std::out output from test cases 2016-07-01 17:25:56 +02:00
Niels
05ddfaf5cf Merge branch 'develop' into feature/improved_documentation 2016-07-01 17:01:02 +02:00
Niels
6e1347e68c fixes #270 2016-07-01 16:58:50 +02:00
Niels
26cab42c38 some minor improvements 2016-07-01 16:52:05 +02:00
Niels
814fb31d64 Merge pull request #275 from dtoma/develop 
Update hexify to use array lookup instead of ternary (#270)
 2016-07-01 16:51:35 +02:00
Niels
a5262c18e2 replaced a copy by a move to increase performance by 16-25% 2016-06-30 12:43:06 +02:00
dtoma
5c129c8981 Update hexify to use array lookup instead of ternary (#270) 2016-06-29 19:28:56 +08:00
Niels
52cbda8048 using std::advance where possible 2016-06-29 12:47:29 +02:00
Niels
a0609b2da3 fixed coverage bug 2016-06-29 09:53:48 +02:00