starred/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-24 14:20:11 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity
1,104 Commits 47 Branches 57 Tags
3d104f1d43ecc85c8af93b8efad63eed7ebd21cb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels 3d104f1d43 version bump 2016-09-14 23:06:39 +02:00
Niels 6bbcdc1ec5 fixes #310 2016-09-14 22:48:12 +02:00
Niels 7b6cba23f3 results for #307 2016-09-12 21:23:12 +02:00
Niels 24c588cd25 Merge branch 'release/2.0.4' into develop 2016-09-11 23:37:30 +02:00
Niels 768d66560e version bump 2016-09-11 23:36:59 +02:00
Niels 15925469c6 Travis updated their Xcode 2016-09-11 22:50:40 +02:00
Niels f922426ec3 fixed #304 2016-09-11 22:40:51 +02:00
Niels 2daab5a4c2 fixed #306 2016-09-11 22:30:08 +02:00
Niels 8ea0ee502d clang 3.9.0 is not working yet 2016-09-03 13:08:17 +02:00
Niels fa0299f03a moved cmake into clang 2016-09-03 12:30:10 +02:00
Niels 36745ed296 install from tarball 2016-09-03 10:34:52 +02:00
Niels f0455b401d forgot sh call 2016-09-03 09:44:10 +02:00
Niels e0d809312b the cmake in apt is too old 2016-09-03 09:17:30 +02:00
Niels bfd6678800 clang 3.9.0 needs a newer cmake 2016-09-03 08:47:07 +02:00
Niels 9639f0dfb3 Clang 3.9.0 has been released 2016-09-03 00:37:45 +02:00
Niels 357baeff5a release 2.0.3 2016-09-01 08:07:52 +02:00
Niels 42be2edd4c fixed test coverage 2016-09-01 00:29:42 +02:00
Niels c8d01fa7b9 Merge branch 'release/2.0.3' into develop 2016-08-31 21:27:50 +02:00
Niels df9fd6237e release 2.0.3 2016-08-31 21:27:23 +02:00
Niels 776880bc49 Merge branch 'feature/iterator_range_parsing' into develop 2016-08-31 20:23:24 +02:00
Niels 740b66f225 cleanup 2016-08-31 20:23:21 +02:00
Niels 58cbf4b3ef added another test case 2016-08-31 18:23:46 +02:00
Niels ae7aaed4ac Merge branch 'develop' into feature/iterator_range_parsing 2016-08-31 18:07:18 +02:00
Niels 442058f8ed interface cleanup 2016-08-31 17:07:35 +02:00
Niels afba1d3fcb forgot to run re2c 2016-08-30 23:51:14 +02:00
Niels 941714c99c template changes did not work with MSVC 2016-08-30 23:49:06 +02:00
Niels a485aa8d27 cleanup and improvement of branch coverage 2016-08-30 23:44:15 +02:00
Niels 6e6e1c9b1f implemented idea from #290 2016-08-30 18:26:07 +02:00
Niels f76f9efe58 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-30 18:20:13 +02:00
Niels Lohmann 463ffb21bc Merge pull request #300 from t-b/fix_warning_in_test_case 
unit-constructor1.cpp: Fix floating point truncation warning
 2016-08-29 22:52:18 +02:00
Niels 29c5f32d42 fixed performance degradation (#272) 2016-08-29 22:36:33 +02:00
Niels Lohmann 87dea32e81 using AppVeyor badge for develop branch 2016-08-24 21:31:11 +02:00
Niels Lohmann bd3bd37e96 removed coverity badge (build is broken, see #299) 2016-08-24 21:29:28 +02:00
Niels 04c6c886eb another experiment 2016-08-24 21:02:33 +02:00
Niels Lohmann 8b833c452a experiment: changed order of parse functions 2016-08-24 07:12:56 +02:00
Niels 1d66ab9f7a fixed lexer issue which required null byte at the end of contiguous storage containers #290 2016-08-23 22:38:05 +02:00
Niels a79d634ccb integrated proposals for #290 2016-08-22 21:40:07 +02:00
Niels 6d1254baba Merge branch 'develop' into feature/iterator_range_parsing 2016-08-22 20:54:55 +02:00
Niels b688119aa4 reverted .travis file 2016-08-22 20:54:32 +02:00
Niels 29a4ef6c5c no execution for special cases 2016-08-22 20:50:12 +02:00
Niels 71af209ea9 fix for YAML file 2016-08-22 20:44:36 +02:00
Niels 79fd4dfbd8 do not build for special cases 2016-08-22 20:40:25 +02:00
Niels cda84ba323 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-21 23:15:27 +02:00
Niels 034244a291 Merge branch 'feature/coverage' into develop 2016-08-21 22:48:02 +02:00
Niels 1e896eb91e improved code coverage 2016-08-21 22:38:56 +02:00
Niels 94331a355d removed LCOV_EXCL_LINE 2016-08-21 21:50:13 +02:00
Niels aa7f5ad8b1 minor changes 2016-08-21 21:48:15 +02:00
Niels 585a39a235 improved branch coverage 2016-08-21 14:39:54 +02:00
Niels b4571360df more on #290 2016-08-21 12:35:40 +02:00
Niels eef8059003 allowing parsing from contiguous containers 2016-08-20 20:29:33 +02:00
Niels 6f3554f040 Merge branch 'develop' into feature/iterator_range_parsing 2016-08-20 18:51:11 +02:00
Niels 0cf7ebaa57 mentioning the CII 2016-08-18 18:43:27 +02:00
Niels d2564c6100 added cppcheck target for travis 2016-08-18 18:29:19 +02:00
Niels 039cedaf8e changes to address #295 2016-08-17 23:14:28 +02:00
Niels 628a5eae50 reset build file 2016-08-17 22:33:26 +02:00
Niels f40f81c87e forgot a semicolon 2016-08-17 21:44:53 +02:00
Niels c0922c7aac /Wall 2016-08-17 21:43:28 +02:00
Niels 35f22e8596 checking MSVC compiler flags 2016-08-17 21:38:19 +02:00
Niels a78eaa27b5 fixed unit tests 2016-08-17 21:31:59 +02:00
Niels 5e67f7af01 added a first version of a parser for #290 2016-08-15 22:44:14 +02:00
Niels f791c5fd2e Merge branch 'develop' into feature/iterator_range_parsing 2016-08-15 21:46:02 +02:00
Niels ca80a71c28 added notes from the CII Best Practices badge 2016-08-15 21:45:49 +02:00
Niels dfc2c1abe5 added assertion for contiguous memory 2016-08-14 23:38:20 +02:00
Niels 92ee1d56eb cleanup 2016-08-14 21:59:41 +02:00
Niels 4871e39415 spell fix 2016-08-14 17:52:21 +02:00
Niels 7b42c973bd fix for MSVC 2016-08-14 17:34:58 +02:00
Niels c9e5d56c9c fix for MSVC 2016-08-14 17:30:53 +02:00
Niels 01386b3977 cleanup 2016-08-14 17:23:15 +02:00
Niels b76f5506d7 added a parser for continguous containers 2016-08-14 14:18:25 +02:00
Niels 03de590372 improved documentation for #289 2016-08-11 20:52:48 +02:00
Niels 37fdcd893d Merge branch 'feature/travis' into develop 2016-08-10 22:50:11 +02:00
Niels 46174879ef clean up 2016-08-10 22:41:09 +02:00
Niels 5db41313ba valgrind + full unit tests takes too long 2016-08-10 21:33:03 +02:00
Niels 1c4ca6d7b1 rubygems -> ruby 2016-08-10 21:00:36 +02:00
Niels d02e67d4a9 coveralls with lcov 2016-08-10 20:56:26 +02:00
Niels ce30526ee8 fixed Valgrind call 2016-08-10 19:35:27 +02:00
Niels efe1d52629 added coverity, coveralls, and valgrind 2016-08-10 18:54:19 +02:00
Niels a2e923de32 removed clang 3.5.x 2016-08-10 18:38:31 +02:00
Niels 4d90331718 a test 2016-08-10 17:42:33 +02:00
Niels 997bc5d1ab more clang versions 2016-08-10 16:56:05 +02:00
Niels 31963723d3 no directory change 2016-08-10 16:35:57 +02:00
Niels 407e8dbb8e fixed YAML error 2016-08-10 16:25:35 +02:00
Niels b1c1fe9d39 added Clang 3.8 2016-08-10 16:22:53 +02:00
Niels b76861dde5 commit to re-fix issue #195 2016-08-09 23:05:42 +02:00
Niels 6150ffb9dc more compilers 2016-08-09 22:49:08 +02:00
Niels be05dbe618 moved sources 2016-08-09 22:33:31 +02:00
Niels 4b37082e36 more GCC versions 2016-08-09 22:29:01 +02:00
Niels 117fd59abd first try 2016-08-09 22:18:13 +02:00
Niels ff612e0e39 reverted last commit 2016-08-09 18:33:06 +02:00
Niels 0b34ddd47a another try for coveralls 2016-08-09 18:19:54 +02:00
Niels fa4fd334b2 accidentially deleted env 2016-08-05 08:56:58 +02:00
Niels d3c6ed08d6 set build-root 2016-08-05 08:40:42 +02:00
Niels 00046f6ff1 fix for coveralls 2016-08-05 08:18:19 +02:00
Niels 38f562af2a reorganization into smaller test units 2016-08-04 22:51:08 +02:00
Niels 2d3374c8b2 removed codecov 2016-08-04 22:10:30 +02:00
Niels bd75ef9f27 added check-fast flag 2016-08-04 22:05:16 +02:00
Niels ff592c6d50 adjusted warning flags 2016-08-04 22:05:05 +02:00
Niels 91b6e223d9 adjusted capacity test cases 2016-08-04 22:04:55 +02:00
Niels d80329034e split test suite in one file per test case 2016-08-04 21:55:47 +02:00
Niels 3944ecd470 chose correct flags 2016-08-04 07:40:04 +02:00