Commit Graph

  • 763705c2a7 Fix: Add missing begin() and end() member functions to alt_string Julian Becker 2018-09-24 19:29:39 +02:00
  • e184b6ecf2 Merge pull request #1252 from koponomarenko/fix-meson-build Niels Lohmann 2018-09-22 14:49:03 +02:00
  • 88b055c2df Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround Niels Lohmann 2018-09-22 14:14:56 +02:00
  • 8799759b85 Add version and license to meson.build Kostiantyn Ponomarenko 2018-09-20 21:54:10 +03:00
  • 4e52277b70 Fix issue #1237 Théo DELRIEU 2018-09-12 17:01:27 +02:00
  • e4bc98d036 Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility Niels Lohmann 2018-09-19 20:46:51 +02:00
  • 4d780b091b Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently. David Guthrie 2018-09-18 16:38:59 -04:00
  • 3b1a5cafad Use a version check to provide backwards comatible imported target names. Chuck Atkins 2018-09-18 13:59:19 -04:00
  • 99939d6340 📝 added lgtm.com badge Niels Lohmann 2018-09-18 19:27:52 +02:00
  • 4e2f35d4c2 👷 adding Xcode 10 worker Niels Lohmann 2018-09-18 19:22:30 +02:00
  • 7fa3b8865c Merge pull request #1221 from rivertam/better-error-305 Niels Lohmann 2018-09-18 12:49:07 +02:00
  • 8f07ab6392 Replace "key-style argument" with "string argument" Ben Berman 2018-09-17 15:36:38 -04:00
  • df33a90774 BSON: Bugfix for non-empty arrays Julian Becker 2018-09-15 14:08:38 +02:00
  • cf485c2907 BSON: Support for arrays Julian Becker 2018-09-15 13:54:08 +02:00
  • 120d1d77d4 BSON: test case for a more complex document Julian Becker 2018-09-15 13:40:20 +02:00
  • 5ce7d6bdd7 BSON: support objects with objects as members Julian Becker 2018-09-15 13:03:42 +02:00
  • 83b427ad67 BSON: unsigned integers Julian Becker 2018-09-15 12:11:21 +02:00
  • c0d8921a67 BSON: support objects with int64 members Julian Becker 2018-09-15 12:00:53 +02:00
  • 7ee361f7ad BSON: support objects with int32 members Julian Becker 2018-09-15 11:54:17 +02:00
  • c5ef023171 BSON: support objects with null members Julian Becker 2018-09-15 11:38:26 +02:00
  • 6c447de076 BSON: Support objects with string members Julian Becker 2018-09-15 11:33:24 +02:00
  • 0c0f2e44b5 BSON: support doubles Julian Becker 2018-09-15 03:23:54 +02:00
  • 9a0dddc5d2 BSON: Object with single boolean Julian Becker 2018-09-15 03:08:50 +02:00
  • 5f5836ce1c BSON: Support empty objects Julian Becker 2018-09-15 00:43:39 +02:00
  • f06c8fd8e3 BSON: serialization of non-objects is not supported Julian Becker 2018-09-14 22:58:22 +02:00
  • 186c747a19 Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix Niels Lohmann 2018-09-10 20:52:11 +02:00
  • 6b5334c167 Move lambda out of unevaluated context mandreyel 2018-09-10 10:02:38 +02:00
  • ebb3c03293 🎨 cleanup after #1228 Niels Lohmann 2018-09-09 18:19:33 +02:00
  • d3428b35c5 Merge pull request #1228 from theodelrieu/remove_static_asserts Niels Lohmann 2018-09-09 18:12:43 +02:00
  • aea648bb7a remove now-useless traits. check for is_basic_json where needed Théo DELRIEU 2018-09-07 12:42:49 +02:00
  • 4b4bbceebf make from_json SFINAE-correct Théo DELRIEU 2018-09-06 16:54:42 +02:00
  • f7971f04a5 make to_json SFINAE-correct Théo DELRIEU 2018-09-06 16:08:01 +02:00
  • f7c8a2145a refactor from/to_json(CompatibleArrayType) Théo DELRIEU 2018-09-05 17:59:10 +02:00
  • 628f76729e do not check for compatible_object_type in compatible_array_type Théo DELRIEU 2018-09-05 17:26:32 +02:00
  • 29f72966c3 refactor is_compatible_type, remove conjunction & co Théo DELRIEU 2018-09-05 17:01:52 +02:00
  • 77967e6548 refactor is_compatible_integer_type Théo DELRIEU 2018-09-05 16:56:45 +02:00
  • 13760857ff refactor is_compatible_array_type Théo DELRIEU 2018-09-05 16:49:27 +02:00
  • 924e95c6e8 refactor is_compatible_string_type Théo DELRIEU 2018-09-05 16:42:55 +02:00
  • e84195ab7b refactor is_compatible_object_type Théo DELRIEU 2018-09-05 16:35:30 +02:00
  • b59c3367c9 use detected instead of has_* traits Théo DELRIEU 2018-09-05 16:02:13 +02:00
  • 1ea8cd128c fix void_t for older compilers Théo DELRIEU 2018-09-07 12:15:35 +02:00
  • eb30ff0615 🚨 fixed a compiler warning #1224 Niels Lohmann 2018-09-06 07:25:19 +02:00
  • ad053ef09c Fix tests for improved error 305(hopefully) Ben Berman 2018-08-30 13:19:09 -04:00
  • bbdfe7dea6 Improve error messages for error 305 Ben Berman 2018-08-30 12:35:51 -04:00
  • d713727f22 Merge pull request #1202 from dennisfischer/develop Niels Lohmann 2018-08-25 10:56:30 +02:00
  • 04597c3a66 Merge pull request #1214 from devsisters/fix-1213 Niels Lohmann 2018-08-24 17:54:28 +02:00
  • aada309f61 Fix #1213 Hyeon Kim 2018-08-24 21:52:24 +09:00
  • 359f98d140 Merge branch 'release/3.2.0' into develop v3.2.0 Niels Lohmann 2018-08-20 19:36:25 +02:00
  • 8c20571136 Merge branch 'release/3.2.0' 3.2.0 Niels Lohmann 2018-08-20 19:36:10 +02:00
  • dfe607c6ff Export package to allow builds without installing Dennis Fischer 2018-08-20 09:23:12 +02:00
  • 9f3857ef6f 🔖 set version to 3.2.0 Niels Lohmann 2018-08-18 18:46:15 +02:00
  • 7608a64e1e 🔨 fixed amalgamation Niels Lohmann 2018-08-18 18:14:12 +02:00
  • a7b02bdce0 🔖 preparing 3.2.0 release Niels Lohmann 2018-08-18 17:48:49 +02:00
  • c6a482b16c 📝 added example for sax_parse Niels Lohmann 2018-08-18 15:42:18 +02:00
  • 5ad52f4167 ⬆️ Catch 1.12.0 Niels Lohmann 2018-08-18 12:02:12 +02:00
  • 3811daa8a3 📝 release preparation Niels Lohmann 2018-08-18 12:00:14 +02:00
  • 6899fa304c Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-08-18 08:15:06 +02:00
  • 57faaf42ca 🚨 fixed a compiler warning Niels Lohmann 2018-08-18 08:15:03 +02:00
  • f78ac4fbd3 Merge pull request #1200 from thyu/develop Niels Lohmann 2018-08-18 08:14:04 +02:00
  • 3004a73951 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax Tsz-Ho Yu 2018-08-18 01:12:19 +01:00
  • e33b31e6aa 🐛 fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) Niels Lohmann 2018-08-17 23:09:45 +02:00
  • b5c54b41fd 📝 overworked documentation Niels Lohmann 2018-08-16 21:53:47 +02:00
  • 07494e06d7 🚨 fixed some compiler warnings Niels Lohmann 2018-08-16 18:20:30 +02:00
  • d5b21b051c Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax Niels Lohmann 2018-08-16 17:47:55 +02:00
  • 0cc3db4f15 add static_asserts on SAX interface Théo DELRIEU 2018-07-24 14:47:41 +02:00
  • 38f8a51a8f use abstract sax class in parser tests Théo DELRIEU 2018-08-16 10:52:33 +02:00
  • 9bbb133094 remove no_limit constant and default values Théo DELRIEU 2018-07-24 13:09:08 +02:00
  • 442886d040 use templates in the sax interface instead of virtuals Théo DELRIEU 2018-07-02 10:14:37 +02:00
  • f6febbe359 split meta.hpp, add detected_t (used to define concepts) Théo DELRIEU 2018-07-24 13:22:44 +02:00
  • 3ac2d81a95 🔨 fixed a MinGW error #1193 Niels Lohmann 2018-08-14 22:13:56 +02:00
  • be2065dce9 🚨 fixing a MinGW warning #1192 Niels Lohmann 2018-08-14 22:11:47 +02:00
  • fed70f6bff 🎨 reindented code Niels Lohmann 2018-08-14 22:11:08 +02:00
  • 0e748f2f8c Merge pull request #1187 from devsisters/json-internal-catch Niels Lohmann 2018-08-14 21:56:29 +02:00
  • 861ee400cc Merge pull request #1176 from grembo/develop Niels Lohmann 2018-08-14 21:48:49 +02:00
  • 3ce4325350 📝 updated documentation of used compilers Niels Lohmann 2018-08-01 22:31:51 +02:00
  • ba4a19d4af 👷 added more CI workers Niels Lohmann 2018-08-01 20:59:58 +02:00
  • 043eff5ba8 👷 added more CI workers Niels Lohmann 2018-07-31 21:18:33 +02:00
  • 05b27e83b7 Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4. Michael Gmelin 2018-07-29 11:57:56 +02:00
  • d5aaeb4cce Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122 Michael Gmelin 2018-07-29 01:29:50 +02:00
  • 3760a38b7e 🏁 implicit conversion is not allowed with MSVC Niels Lohmann 2018-07-21 11:47:05 +02:00
  • 5b14411669 🏁 trying to fix C2440 error Niels Lohmann 2018-07-21 10:59:00 +02:00
  • 347e77bdc1 🚑 fix for #1169 Niels Lohmann 2018-07-21 10:31:55 +02:00
  • 04372a8c56 🏁 fix for #1168 Niels Lohmann 2018-07-19 17:31:50 +02:00
  • d0e60de433 Add new JSON_INTERNAL_CATCH macro function Hyeon Kim 2018-07-19 15:43:41 +09:00
  • 7bfc406ded 📝 added note about CocoaPods #1148 Niels Lohmann 2018-07-05 21:18:46 +02:00
  • d456a2d777 Merge pull request #1151 from sonulohani/bigObjFix Niels Lohmann 2018-06-29 09:03:43 +02:00
  • b8ad3388ec Fixed compiler error in VS 2015 for debug mode https://github.com/nlohmann/json/issues/1114 Sonu Lohani 2018-06-29 09:34:41 +05:30
  • 39dd775e38 🔨 cleanup after #1134 Niels Lohmann 2018-06-28 21:32:32 +02:00
  • 86a96b059d Merge pull request #1134 from Daniel599/feature/items_iterator Niels Lohmann 2018-06-28 21:21:17 +02:00
  • 396a914f9e 🔨 added macro to disable compiler check #1128 Niels Lohmann 2018-06-26 22:47:40 +02:00
  • bab5826504 Merge pull request #1144 from jrakow/cppreference-link-fix Niels Lohmann 2018-06-26 07:58:45 +02:00
  • 515cfc2d89 Merge pull request #1142 from jrakow/develop Niels Lohmann 2018-06-24 23:33:30 +02:00
  • 963d06a13c 📝 fix links to cppreference named requirements Julius Rakow 2018-06-24 22:30:37 +02:00
  • 9f00db48d9 📝 link to cppreference via HTTPS Julius Rakow 2018-06-24 22:29:33 +02:00
  • ec2ebd5ec9 meson: add multiple headers target Julius Rakow 2018-06-24 16:53:02 +02:00
  • 0bb36bb140 meson: fix include directory Julius Rakow 2018-06-23 20:45:00 +02:00
  • 62457729e8 📝 mentioned MinGW in README Niels Lohmann 2018-06-24 18:03:59 +02:00
  • 09c0df4a21 👷 choosing correct image Niels Lohmann 2018-06-24 17:40:16 +02:00
  • 1bbc4a0859 👷 using Ninja to speed up build Niels Lohmann 2018-06-24 17:10:13 +02:00
  • d8fe13fc83 🔨 fixed escaping for MinGW Niels Lohmann 2018-06-24 16:57:53 +02:00