haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-08-23 21:42:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
1561 commits 13 branches 56 tags 227 MiB
Commit graph

1561 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann 303e873ae8 🔖 bumped version to 2.0.9 2016-12-16 20:45:46 +01:00
Niels Lohmann f6f7fed99a 🚨 removed some warnings 2016-12-16 18:57:19 +01:00
Niels Lohmann f24e4f680e 🎨 cleanup after PR #395 2016-12-14 22:30:09 +01:00
Niels Lohmann fe00b368ae 🔀 merge pull request #395 from Bosswestfalen/develop 
Replace class iterator and const_iterator by using a single template class to reduce code.
 2016-12-14 21:56:43 +01:00
Niels Lohmann 2f94c30bad ✅ added a regression test for #380 / #390 2016-12-13 21:46:07 +01:00
Niels Lohmann 4e2fb1a533 Merge pull request #390 from qwename/integer-overflow 
🔀 fix issue #380: Signed integer overflow check
 2016-12-13 21:26:53 +01:00
Niels Lohmann dfafd2c259 👷 can't get clang sanitizer to work #394 
See https://travis-ci.org/nlohmann/json/jobs/183684093 for a failing
build.
 2016-12-13 21:23:59 +01:00
Bosswestfalen 92e28c3153 added missing changes in json.hpp.re2c 2016-12-13 20:30:56 +01:00
Niels Lohmann c3fac19692 👷 another try for sanitizers #394 2016-12-13 19:41:36 +01:00
Niels Lohmann 3f089cab2b 👷 moved instructed build to "before_script" #394 2016-12-13 18:24:16 +01:00
Niels Lohmann 9b5411db57 👷 clang 3.9.0 is not working #394 2016-12-13 17:55:41 +01:00
Niels Lohmann f5d4a9c4eb 👷 added Clang 3.9.0 and sanitizer build #394 2016-12-13 17:51:46 +01:00
Yixin Zhang 703d4baf8b Fixed conversion warnings 
Use static_cast on digit.
 2016-12-12 21:12:08 -05:00
Yixin Zhang bd6422f583 Ran make pretty 2016-12-12 21:12:08 -05:00
Yixin Zhang 1e981115c9 Fix issue #380: Signed integer overflow check 
Instead of checking something like `x * y + z > max` where `x * y` can
overflow, check for `x > (max - z) / y` instead.
 2016-12-12 21:12:08 -05:00
Alex Astashyn 6fba52b6da Merged upstream/develop into feature/locale_independent_str_to_num 2016-12-12 20:27:15 -05:00
Alex Astashyn 5cad2006eb Tweaked check for preserved sign; added LCOV_EXCL_LINE 2016-12-12 20:15:57 -05:00
Alex Astashyn 65b9b0c429 Disabling snprintf pre-check, since can't get locale-specific behavior to manifest in AppVeyor 2016-12-12 19:50:21 -05:00
Alex Astashyn 0f8de48ddb Disabling strtod pre-check, since can't get locale-specific behavior to manifest in AppVeyor 2016-12-12 19:48:14 -05:00
Alex Astashyn cd0b651d43 Tweaked check for preserved sign; added LCOV_EXCL_LINE 2016-12-12 19:46:47 -05:00
Niels Lohmann 79fa8b2f41 🚑 fix to address #389 2016-12-12 23:19:43 +01:00
Bosswestfalen dd3f4f9b92 Replaced class iterator and class const_iterator with aliases of template <typename U> iter_impl. iter_impl has operator const_iterator to create an const_iterator from an iterator. 2016-12-12 19:26:45 +01:00
Niels Lohmann 447e01427d 🚨 fixed some warnings 2016-12-12 18:21:17 +01:00
Niels Lohmann b8776e8613 🚑 fix for #393 2016-12-12 17:39:56 +01:00
Niels Lohmann f6c21a1f20 📝 added note to example files 2016-12-12 08:25:08 +01:00
Niels Lohmann 5402458ff5 🚑 fixed an AddressSanitizer warning 2016-12-12 08:13:26 +01:00
Niels Lohmann a25d570040 📝 added TOC to README #383 2016-12-11 19:42:36 +01:00
Niels Lohmann ea7b40687b 📝 updated FAQ of the contribution guidelines #382 2016-12-11 16:36:39 +01:00
Niels Lohmann b2991950a5 📝 added not wrt re2c version #390 2016-12-11 16:21:53 +01:00
Niels Lohmann e906933f39 🔀 Merge branch 'feature/messagepack' into develop 2016-12-11 16:11:59 +01:00
Niels Lohmann a59eb4868a 🔀 Merge branch 'develop' into feature/messagepack 2016-12-11 16:11:43 +01:00
Niels Lohmann a9d7d315a5 📝 cleanup after #391 2016-12-11 16:06:52 +01:00
Niels Lohmann 446019aefd 🔀 merge pull request #391 from jaredgrubb/jgrubb-clang-doc-warning 
Clang: quiet a warning
 2016-12-11 16:04:27 +01:00
Niels Lohmann 6fa4f96ba3 📝 fixed two documentation warnings 2016-12-11 16:03:23 +01:00
Niels Lohmann dc6fc3e079 📝 clean up and added documentation for #358 2016-12-11 13:36:08 +01:00
Niels Lohmann fdce38fa79 ✅ fixed a test case 2016-12-11 00:39:26 +01:00
Niels Lohmann e8c903294f ✅ more test cases for CBOR and msgpack 2016-12-11 00:05:29 +01:00
Niels Lohmann 41673e8fed 🐛 fixed CBOR code and added test cases 2016-12-10 23:12:57 +01:00
Jared Grubb 98d6e6e523 Clang: quiet a warning 2016-12-10 13:19:56 -08:00
Niels Lohmann 7e5d6af5c1 🔨 refactored msgpack code 2016-12-10 21:30:18 +01:00
Niels Lohmann f1b95d78f9 🔨 refactored CBOR code to a switch 2016-12-10 19:29:45 +01:00
Niels Lohmann d99c230f51 ✨ implemented indefinite-length CBOR types (#387) 2016-12-10 18:32:56 +01:00
Alex Astashyn 01930357f7 Tweaking unit test, as digits grouping is failing to be invoked in CI 2016-12-08 22:39:38 -05:00
Alex Astashyn 343c9f9baa Addressing compiler warnings 2016-12-08 22:36:18 -05:00
Alex Astashyn 1c029b97c0 Still trying to invoke locale-specific behavior in CI 2016-12-08 22:13:05 -05:00
Alex Astashyn 38499e84fc Removed unused struct; fixed comments 2016-12-08 21:38:14 -05:00
Niels Lohmann 6b84c4155c 🔨 refactored get_from_vector function 
Snippet from http://stackoverflow.com/a/41031865/266378
 2016-12-08 09:37:23 +01:00
Alex Astashyn 50f0484ad5 Added unit test for issue #378 2016-12-07 20:23:25 -05:00
Alex Astashyn 27d9740ad6 Tweaks to unit-test for issue #379 2016-12-07 19:55:07 -05:00
Alex Astashyn 0a4a6a8399 Refactored to avoid using exceptions, as there are plans to support exceptionless mode 2016-12-07 19:53:27 -05:00