Commit Graph

  • e48114bbd6 🔨 check for value of _HAS_CXX17 Niels Lohmann 2017-04-09 14:02:04 +02:00
  • 628be157a2 🐛 added fix for #464 Niels Lohmann 2017-04-09 13:52:04 +02:00
  • c40c8ac92e 👷 excluding MSVC 2015 with "/permissive- /std:c++latest /utf-8" Niels Lohmann 2017-04-09 12:00:30 +02:00
  • a9f4094580 👷 another try Niels Lohmann 2017-04-09 11:47:31 +02:00
  • 180d249f6c 👷 another try Niels Lohmann 2017-04-09 11:38:42 +02:00
  • d3d87674c8 👷 fixed AppVeyor syntax Niels Lohmann 2017-04-09 11:00:39 +02:00
  • 9d9c5216d7 👷 additional flags for MSVC #464 Niels Lohmann 2017-04-09 10:59:45 +02:00
  • 6f99d5b2e9 🔨 fixed test case Niels Lohmann 2017-04-08 23:39:17 +02:00
  • d4e49873b7 👷 experimenting with configurations Niels Lohmann 2017-04-08 21:56:42 +02:00
  • 97a25de938 proposal for #428 Niels Lohmann 2017-04-07 18:29:09 +02:00
  • d62d48fc48 🔀 merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-04-07 17:19:52 +02:00
  • 90273e930c 🐛 fix for #512 Niels Lohmann 2017-04-07 15:44:41 +02:00
  • ff72f38863 🔨 fixed another warning Niels Lohmann 2017-04-06 19:54:08 +02:00
  • b992acc2e7 🔨 fixed a compiler warning Niels Lohmann 2017-04-05 20:39:27 +02:00
  • 08fdfcca9a 🔨 implemented a binary writer Niels Lohmann 2017-04-04 23:17:43 +02:00
  • c28bf823bc 🔨 added endianess check Niels Lohmann 2017-04-04 17:30:43 +02:00
  • b15fc13dd1 🔨 implemented MessagePack in binary_reader Niels Lohmann 2017-04-04 16:59:19 +02:00
  • 3a34f2d82c Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-04-04 15:55:40 +02:00
  • 782570d46f 🔨 cleanup Niels Lohmann 2017-04-03 22:58:46 +02:00
  • 4f6b63e492 Merge pull request #545 from theodelrieu/feature/enum_class_support Niels Lohmann 2017-04-03 22:13:59 +02:00
  • ea667db446 🔨 fixed compilation errors Niels Lohmann 2017-04-03 21:53:23 +02:00
  • 89efe627fe 🔨 a lot of restructuring Niels Lohmann 2017-04-02 18:46:21 +02:00
  • af9b21151c add enum class default conversions Théo DELRIEU 2017-04-02 13:10:15 +02:00
  • 3a5cf9bd0a 🔨 improved code coverage Niels Lohmann 2017-04-01 08:34:58 +02:00
  • c32d2e5b3c 🔨 removed unget() function Niels Lohmann 2017-04-01 00:36:05 +02:00
  • 8d393b5eff Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-31 23:58:45 +02:00
  • 3fa0610856 🔨 added minibench to ignore list Niels Lohmann 2017-03-31 23:57:24 +02:00
  • 50ee0a62f5 🔨 replaced lookup-tables by switches Niels Lohmann 2017-03-31 23:24:33 +02:00
  • 4c821c9e9c 🔨 moved buffer size to interface Niels Lohmann 2017-03-31 17:11:51 +02:00
  • d07596a0ea 📝 mentioned #540 and fixed #538 Niels Lohmann 2017-03-30 17:39:02 +02:00
  • 7881783745 Merge pull request #540 from tinloaf/diagnostics Niels Lohmann 2017-03-30 17:25:29 +02:00
  • 0b1b6307a5 Also change the re2c file Lukas Barth 2017-03-30 16:14:02 +02:00
  • 40aff4182f Pop for every push Lukas Barth 2017-03-30 16:10:03 +02:00
  • 60057a4728 🔨 fixed bugs introduced by merging from develop Niels Lohmann 2017-03-29 07:54:26 +02:00
  • a690a9f2d2 Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-29 00:57:09 +02:00
  • c2e80a72d7 🔨 deprecated j << istream / j >> ostream functions #367 Niels Lohmann 2017-03-29 00:39:47 +02:00
  • 9578c0f700 Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-28 23:47:17 +02:00
  • b4dbebffcd added regression test for #464 Niels Lohmann 2017-03-28 23:28:54 +02:00
  • 62dfdf3f5d 📝 addressed #514 Niels Lohmann 2017-03-28 23:24:59 +02:00
  • 5d586b0192 🔨 cleanup Niels Lohmann 2017-03-28 23:20:45 +02:00
  • 19d119e18c 🔨 fixed a warning in MSVC Niels Lohmann 2017-03-28 22:10:24 +02:00
  • 6b12e40478 🏁 removed __builtin_expect for MSVC Niels Lohmann 2017-03-28 21:55:26 +02:00
  • d025b6aaf7 Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-28 21:39:36 +02:00
  • 19cd206d99 📝 documented Xcode 8.3 Niels Lohmann 2017-03-28 21:39:16 +02:00
  • a0aa6ad2b2 👷 added Xcode 8.3 Niels Lohmann 2017-03-28 20:42:12 +02:00
  • d37ca2eba8 🔨 fixed test case Niels Lohmann 2017-03-28 20:29:27 +02:00
  • 50e251f5f6 🔨 adjusted test case to new signature of token_type_name() Niels Lohmann 2017-03-28 20:17:00 +02:00
  • 6a6fbea62c 🔨 some cleanup Niels Lohmann 2017-03-28 20:08:08 +02:00
  • 1e495945f1 🔨 fixed buffer overflow Niels Lohmann 2017-03-28 18:06:43 +02:00
  • bbb6bd9de5 🔨 fixing last failing test cases Niels Lohmann 2017-03-28 17:00:03 +02:00
  • b0c47abd88 🔨 rewrote string parser to cope with UTF-8 Niels Lohmann 2017-03-27 22:58:44 +02:00
  • f75e195db3 🔨 added code for user-defined number types Niels Lohmann 2017-03-26 18:45:04 +02:00
  • 3425527970 🔨 added code for locale-independent number parsing Niels Lohmann 2017-03-26 18:12:58 +02:00
  • 06e2a291b1 🔨 fixed number parsing Niels Lohmann 2017-03-26 17:26:41 +02:00
  • 3b069b4b4c 🔨 adjusted more expected exceptions Niels Lohmann 2017-03-26 16:19:07 +02:00
  • 99e0d8b339 🔨 fixed \uxxxx parsing Niels Lohmann 2017-03-26 15:29:08 +02:00
  • f47cf152a8 Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-26 13:14:14 +02:00
  • d4d51460ab Merge branch 'feature/noexcept_exceptions' into develop Niels Lohmann 2017-03-26 12:54:22 +02:00
  • 3336194306 🔨 reverted changes that led to Travis failures Niels Lohmann 2017-03-26 12:23:10 +02:00
  • 53b501a785 🔨 cleanup Niels Lohmann 2017-03-25 23:31:03 +01:00
  • cf7786887c 🔨 fixed check for is_nothrow_copy_constructible Niels Lohmann 2017-03-25 17:35:57 +01:00
  • c333679a96 🔨 small refactoring Niels Lohmann 2017-03-25 17:25:39 +01:00
  • cc36c65a89 🚑 made exceptions nothrow-copy-constructible #531 Niels Lohmann 2017-03-25 16:22:52 +01:00
  • a58ed3cd17 💄 cleanup Niels Lohmann 2017-03-25 14:47:23 +01:00
  • 20bcf1015b 📝 cleanup after #536 Niels Lohmann 2017-03-25 14:19:05 +01:00
  • dc6e9b6188 Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-25 14:12:58 +01:00
  • 0f9585685a Merge pull request #536 from vpetrigo/feature/VS17_appveyor_support Niels Lohmann 2017-03-25 14:12:30 +01:00
  • 8edb0cd15c Add VS17 image to appveyor matrix Vladimir Petrigo 2017-03-25 14:57:58 +03:00
  • a93ec07c8c Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-03-24 19:53:19 +01:00
  • 3d597dda5d 📝 update after #534 Niels Lohmann 2017-03-24 19:51:11 +01:00
  • 40160f482a 🚧 manual lexer Niels Lohmann 2017-03-24 19:49:02 +01:00
  • bba688f53e Merge pull request #534 from TedLyngmo/utf8_encoding_enhancement Niels Lohmann 2017-03-24 19:38:29 +01:00
  • cea2426731 UTF8 encoding enhancement Ted Lyngmo 2017-03-24 14:56:48 +01:00
  • 8a872927e8 Merge pull request #530 from berkus/patch-1 Niels Lohmann 2017-03-23 13:57:54 +01:00
  • b14629b0a6 Fix typo Berkus Decker 2017-03-23 14:50:41 +02:00
  • 54db53c230 📝 update after #527 and #525 Niels Lohmann 2017-03-22 08:10:31 +01:00
  • d60851168e 🚨 fixed a compiler warning #527 Niels Lohmann 2017-03-22 08:10:02 +01:00
  • 67a06834b0 Merge pull request #526 from krzysztofwos/feature/exception-base-class Niels Lohmann 2017-03-22 07:50:34 +01:00
  • b9c3b8d688 Exit with an error if re2c is not available Krzysztof Woś 2017-03-20 13:07:01 +09:00
  • 86579209c8 Make exception base class visible in basic_json Krzysztof Woś 2017-03-20 12:42:44 +09:00
  • 31a6c0910e 🚑 fix for #519 Niels Lohmann 2017-03-17 22:18:48 +01:00
  • f547679de5 🚑 fix for #516 and #518 Niels Lohmann 2017-03-17 22:18:05 +01:00
  • 2d474b5273 Merge pull request #510 from alex-weej/patch-1 Niels Lohmann 2017-03-17 06:47:11 +01:00
  • 836f1c4189 🎨 Namespace uint8_t from the C++ stdlib Alexander “weej” Jones 2017-03-16 18:24:41 +00:00
  • cd43600e6f 💄 cleanup after #508 Niels Lohmann 2017-03-16 19:02:05 +01:00
  • 773b33e016 Merge pull request #508 from theodelrieu/feature/c_array_conversion Niels Lohmann 2017-03-16 19:00:58 +01:00
  • c5711f3072 🚧 a lot of minor changes Niels Lohmann 2017-03-16 18:39:33 +01:00
  • 483a58f625 🚨 added pedantic flags for GCC Niels Lohmann 2017-03-16 18:35:45 +01:00
  • dbebf8de47 add to_json method for C arrays Théo DELRIEU 2017-03-16 13:43:53 +01:00
  • 100bf3ef2c Merge branch 'feature/getline' into develop Niels Lohmann 2017-03-14 23:08:19 +01:00
  • 710f8a2686 📝 improved documentation for to-CBOR and to-msgpack functions Niels Lohmann 2017-03-14 23:08:05 +01:00
  • 1de80e8af4 🔨 added user-defined exception #493 Niels Lohmann 2017-03-14 21:31:36 +01:00
  • 63c2c62f19 🔨 changed call from "not good()" to "fail()" #493 Niels Lohmann 2017-03-14 21:24:53 +01:00
  • 95474e420d 🏁 added parentheses around max/min calls #506 Niels Lohmann 2017-03-14 21:11:20 +01:00
  • b026591e9e 🚑 added special case to fuzzers to fix #504 Niels Lohmann 2017-03-14 21:05:38 +01:00
  • bfe4788e32 🚑 fix for #500 Niels Lohmann 2017-03-14 16:14:05 +01:00
  • 84072fbd6d 💄 fixed indentation Niels Lohmann 2017-03-14 16:07:28 +01:00
  • b8b4362ca4 🔥 removed accidentally committed binaries Niels Lohmann 2017-03-13 19:04:19 +01:00
  • c5cf32e34d 🔨 added user-defined exception 406 Niels Lohmann 2017-03-12 20:59:33 +01:00
  • 43b8285249 🔀 merge branch 'feature/exceptions_3.0.0' into develop Niels Lohmann 2017-03-12 20:34:30 +01:00