Commit Graph

  • 714c592680 Disabled implicit conversion to string_view on MSVC 15.13 and older Guillaume Racicot 2018-06-01 14:22:57 -04:00
  • e830bc502f Merge pull request #1117 from TinyTinni/develop Niels Lohmann 2018-06-01 08:05:45 +02:00
  • ecadcdb593 added char cast Matthias Möller 2018-05-31 16:36:16 +02:00
  • 48656a49f5 typo Matthias Möller 2018-05-31 15:32:21 +02:00
  • 64acb42aa7 remove stringstream dependency Matthias Möller 2018-05-31 13:27:11 +02:00
  • 8efbf8d7bb 📝 documentation to avoid future issues like #1108 Niels Lohmann 2018-05-28 18:14:44 +02:00
  • e5a67fc3f8 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-05-28 17:57:46 +02:00
  • a49644ab74 🚑 adjusted Fuzzer to new parser Niels Lohmann 2018-05-28 17:57:22 +02:00
  • 0efaf891e5 Merge pull request #1089 from theodelrieu/feature/map_conversion Niels Lohmann 2018-05-28 14:53:23 +02:00
  • c5e63fd684 Provide a from_json overload for std::map Théo DELRIEU 2018-05-14 11:51:37 +02:00
  • db03d09312 Merge branch 'feature/key_ref' into develop (fixes #1098) Niels Lohmann 2018-05-27 22:26:00 +02:00
  • cf9299d222 Merge branch 'feature/sax2' into develop #971 Niels Lohmann 2018-05-27 18:12:59 +02:00
  • 3cdc4d784b 📝 added documentation Niels Lohmann 2018-05-27 18:07:53 +02:00
  • adf09726b0 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-05-27 14:26:13 +02:00
  • 481ace65c4 🔨 only calculate array index string when needed #1098 Niels Lohmann 2018-05-27 12:04:22 +02:00
  • 1c6b332dcd 👌 mitigating cppcheck bug #1101 Niels Lohmann 2018-05-26 14:10:13 +02:00
  • 90eb0a91e0 keys are now returned as const reference #1098 Niels Lohmann 2018-05-26 13:26:40 +02:00
  • 1f84cc2c88 adjusted test cases Niels Lohmann 2018-05-17 16:50:37 +02:00
  • 717301d1bc Merge branch 'testsuite' into feature/sax2 Niels Lohmann 2018-05-17 16:36:43 +02:00
  • 4639bb2c8f added more tests from recent nst's JSONTestSuite Niels Lohmann 2018-05-17 10:10:01 +02:00
  • e94862a649 🚑 fixed error in callback logic Niels Lohmann 2018-05-06 19:00:49 +02:00
  • ae213721b1 🔨 removed unget function for wstring parsers Niels Lohmann 2018-05-06 14:05:29 +02:00
  • 5ff2abb90d Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-05-06 13:29:23 +02:00
  • 567fe9b7a0 Merge pull request #1078 from martin-mfg/patch-1 Niels Lohmann 2018-05-04 17:04:35 +02:00
  • 377e956655 fix typo in readme martin-mfg 2018-05-03 22:42:52 +02:00
  • 5da596385b Update issue templates Niels Lohmann 2018-05-03 18:35:56 +02:00
  • 7bbe7bb98f 🔥 removed old issue template Niels Lohmann 2018-05-03 18:35:21 +02:00
  • 14f01e1981 🔧 update issue templates Niels Lohmann 2018-05-03 18:32:53 +02:00
  • 86b0732a10 📝 added public key used for commits and releases Niels Lohmann 2018-05-03 18:11:42 +02:00
  • ed69e50ad2 📄 added SPDX-License-Identifier Niels Lohmann 2018-05-03 17:41:45 +02:00
  • 5bc4ff9da3 Merge branch 'feature/wstring' into develop Niels Lohmann 2018-04-29 17:29:57 +02:00
  • fa3e42f826 Merge branch 'develop' into feature/wstring Niels Lohmann 2018-04-29 13:16:12 +02:00
  • b5d1755dfb 🔥 removed commented-out test cases #1060 Niels Lohmann 2018-04-22 15:41:42 +02:00
  • 0ab8fab338 Merge pull request #1058 from dns13/patch-1 Niels Lohmann 2018-04-17 23:26:00 +05:30
  • 65b4d8251b Fix typo in single_include, too Jan Schöppach 2018-04-17 13:02:36 +02:00
  • 53fb230098 Fix typo Jan Schöppach 2018-04-17 12:08:44 +02:00
  • 46ec2fddf8 📝 updated THANKS list Niels Lohmann 2018-04-10 18:13:37 +02:00
  • b8bfd1140d Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements Niels Lohmann 2018-04-10 17:57:21 +02:00
  • 33a2154f8d Enable target namespaces and build dir project config Chuck Atkins 2018-04-09 11:32:18 -04:00
  • 29362c6ace Merge pull request #1047 from jammehcow/patch-1 Niels Lohmann 2018-04-10 08:39:58 +02:00
  • c02a3155d4 👷 added Xcode 9.3 builder Niels Lohmann 2018-04-10 08:39:28 +02:00
  • 8d8f890771 💩 first try on #1045 Niels Lohmann 2018-04-10 08:29:07 +02:00
  • 7f20e9ddc7 Fixed incorrect version number in README James Upjohn 2018-04-10 17:16:44 +12:00
  • 031b88d315 Make the CMake install dir user-configurable Chuck Atkins 2018-04-09 11:31:25 -04:00
  • aaee18ce90 Added test for string conversion with string_view Guillaume Racicot 2018-04-09 11:15:33 -04:00
  • 7c503c64b7 Merge pull request #1043 from coryan/patch-1 Niels Lohmann 2018-04-09 08:19:56 +02:00
  • 4286b16b71 Fix trivial typo in comment. Carlos O'Ryan 2018-04-08 15:46:25 -04:00
  • cf91b4f2bb Merge branch 'develop' into feature/wstring Niels Lohmann 2018-04-08 11:36:58 +02:00
  • f924df1835 Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-04-08 11:36:44 +02:00
  • acf10d9af7 Merge pull request #1041 from ax3l/topic-spack Niels Lohmann 2018-04-08 11:32:35 +02:00
  • e1ea8369ad Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-04-08 09:31:59 +02:00
  • 40f279c59d Merge branch 'feature/issue1021' into develop Niels Lohmann 2018-04-08 09:28:37 +02:00
  • 18a0271a95 Merge branch 'develop' into feature/issue1021 Niels Lohmann 2018-04-08 09:21:43 +02:00
  • 1ae9896387 Package Manager: Spack Axel Huebl 2018-04-07 16:43:01 +02:00
  • 83b143382e Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin Niels Lohmann 2018-04-07 15:14:59 +02:00
  • e439a1a9a7 CMake: 3.8+ is Sufficient Axel Huebl 2018-04-07 13:15:44 +02:00
  • 495436a5d5 Merge pull request #1026 from ktonon/develop Niels Lohmann 2018-04-03 17:34:42 +02:00
  • a35d414c39 Update CMake to latest on Travis Kevin Tonon 2018-04-03 08:28:07 -04:00
  • 08a7233d1b 🚑 fixed commit 1e08654 Niels Lohmann 2018-04-02 22:38:44 +02:00
  • 1e08654f99 🔨 cleanup Niels Lohmann 2018-04-02 22:25:17 +02:00
  • aa89c5e048 🔨 removing unget_character() function from input adapters #834 Niels Lohmann 2018-04-02 21:10:48 +02:00
  • 6678eb2b4a improved test coverage #1031 Niels Lohmann 2018-04-02 15:38:49 +02:00
  • 16c5bfeaad 👌 fixed compiler warnings #1031 Niels Lohmann 2018-04-02 13:01:56 +02:00
  • 727dd4664b 🔨 trying to make tests run with MSVC #1031 Niels Lohmann 2018-04-02 12:27:07 +02:00
  • ab89ae4e50 🔨 trying to make tests run with MSVC #1031 Niels Lohmann 2018-04-02 11:34:36 +02:00
  • eb06d0531a 🚧 added input adapter for wide strings #1031 Niels Lohmann 2018-04-01 19:12:36 +02:00
  • ba6edd5634 🔨 cleanup Niels Lohmann 2018-03-30 00:38:18 +02:00
  • 850671b9f1 🔨 using a vector<bool> for the parser hierarchy Niels Lohmann 2018-03-29 18:45:43 +02:00
  • 4efa8cdb4c 💚 fixed Valgrind options #1030 Niels Lohmann 2018-03-29 17:19:21 +02:00
  • 830c93fd09 📝 fixed example for operator> #1029 Niels Lohmann 2018-03-29 17:07:55 +02:00
  • c78dbc366c Added test for conversion to string_view Guillaume Racicot 2018-03-29 01:03:57 -04:00
  • 53d8d57921 Amalgamate single include Guillaume Racicot 2018-03-29 01:03:36 -04:00
  • 5f723bbec6 🔨 realized callback parser wirh SAX interface #971 Niels Lohmann 2018-03-28 23:39:39 +02:00
  • 896a9db461 🔨 improved code #1021 Niels Lohmann 2018-03-28 19:37:21 +02:00
  • 73cc5089e3 Using target_compile_features to specify C++ 11 standard Kevin Tonon 2018-03-27 12:51:30 -04:00
  • a9baab76c2 🚑 fix for #1021 Niels Lohmann 2018-03-28 18:20:55 +02:00
  • 4f6b2b6429 🔨 changed SAX interface Niels Lohmann 2018-03-21 20:12:06 +01:00
  • 2537677e4c improved test coverage Niels Lohmann 2018-03-20 23:40:01 +01:00
  • 9e1abb4842 improved coverage Niels Lohmann 2018-03-20 22:39:08 +01:00
  • 1e38ffc014 more tests Niels Lohmann 2018-03-20 20:04:11 +01:00
  • 25f56ff207 📝 updated documentation Niels Lohmann 2018-03-20 19:22:18 +01:00
  • 99ecca55c4 improved test coverage Niels Lohmann 2018-03-20 18:49:10 +01:00
  • 9e07e9b4ec implemented non-throwing binary reader Niels Lohmann 2018-03-19 22:48:13 +01:00
  • a271ee5f16 ♻️ proper use of SAX parser for binary formats Niels Lohmann 2018-03-18 23:00:45 +01:00
  • 943d641054 🔨 some refactoring Niels Lohmann 2018-03-18 16:07:21 +01:00
  • 22929fe189 🚧 started a SAX/DOM/callback parser Niels Lohmann 2018-03-18 15:13:53 +01:00
  • 375b05a17d 🔨 cleanup Niels Lohmann 2018-03-17 23:31:18 +01:00
  • 606a25195f improved test coverage Niels Lohmann 2018-03-17 19:15:59 +01:00
  • c87ffad45c ♻️ implemented a non-recursive parser Niels Lohmann 2018-03-17 14:46:50 +01:00
  • 2a5506ed98 Amalgamated headers Guillaume Racicot 2018-03-16 13:16:10 -04:00
  • 8165707990 basic_json now supports getting many type of strings Guillaume Racicot 2018-03-15 15:35:00 -04:00
  • 27cf05af8d Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-14 22:02:19 +01:00
  • d2dd27dc3b Merge branch 'release/3.1.2' into develop v3.1.2 Niels Lohmann 2018-03-14 21:48:03 +01:00
  • 183390c10b Merge branch 'release/3.1.2' 3.1.2 Niels Lohmann 2018-03-14 21:47:50 +01:00
  • 8a6c8cb0f7 🔖 set version to 3.1.2 Niels Lohmann 2018-03-14 21:32:03 +01:00
  • afef474c0d 🔖 set version to 3.1.2 Niels Lohmann 2018-03-14 21:09:27 +01:00
  • a52e8355b8 oops Niels Lohmann 2018-03-14 17:32:48 +01:00
  • 21410d50af 🏁 moved /Wall to CMake Niels Lohmann 2018-03-14 17:21:31 +01:00
  • 829ed74d66 🏁 experimenting with /Wall Niels Lohmann 2018-03-14 07:38:22 +01:00
  • 1262d474eb 🏁 fixed an MSVC warning Niels Lohmann 2018-03-14 07:32:28 +01:00