Commit Graph

  • 8d295235a5 🔥 remove unused boolean_operators.hpp header Niels Lohmann 2020-07-11 19:20:44 +02:00
  • 6477b9b20a ♻️ replace further alternative operators Niels Lohmann 2020-07-11 14:09:06 +02:00
  • 7f923424b3 🔀 merge develop branch and resolve conflicts Niels Lohmann 2020-07-11 14:05:02 +02:00
  • dc06f100be Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows Niels Lohmann 2020-07-11 14:04:40 +02:00
  • 889f269a6c ♻️ replace further alternative operators Niels Lohmann 2020-07-11 13:51:25 +02:00
  • b2240f7508 🏁 remove failing code for Clang/Windows Niels Lohmann 2020-07-11 13:46:04 +02:00
  • 609a0046c4 ♻️ replace further alternative operators Niels Lohmann 2020-07-11 13:39:14 +02:00
  • 3a80823ff8 🔀 merge develop branch and resolve conflicts Niels Lohmann 2020-07-11 13:21:13 +02:00
  • 9c21285133 Merge branch 'develop' of https://github.com/nlohmann/json into issue2179 Niels Lohmann 2020-07-11 13:20:16 +02:00
  • 5f146cb853 Merge pull request #2206 from gatopeich/issue2179 Niels Lohmann 2020-07-11 13:15:40 +02:00
  • 47d154dd49 Remove redundant comment gatopeich 2020-07-11 00:34:12 +01:00
  • f9a1fec272 Remove redundant comment gatopeich 2020-07-11 00:34:02 +01:00
  • cbafed3494 ⬇️ require CMake 3.1 Niels Lohmann 2020-07-10 12:53:48 +02:00
  • b6d0a4ab30 Merge branch 'develop' of https://github.com/nlohmann/json into issue2228 Niels Lohmann 2020-07-10 12:46:43 +02:00
  • 2c231f9567 💚 remove failing test Niels Lohmann 2020-07-10 12:46:31 +02:00
  • 7fbcae2679 🚨 fix a warning Niels Lohmann 2020-07-09 22:17:59 +02:00
  • f62b4626be Removing comment about AllocatorType per review request gatopeich 2020-07-09 21:12:11 +01:00
  • 3aa4c0b827 add tests for number types Niels Lohmann 2020-07-09 22:07:07 +02:00
  • 0eb7b0a991 Update README.md per review comments gatopeich 2020-07-09 20:47:19 +01:00
  • 612f326052 ♻️ add proper SFINAE for 64 bit check Niels Lohmann 2020-07-09 21:31:01 +02:00
  • 75d5d05993 Merge pull request #2253 from ericonr/pkgconf Niels Lohmann 2020-07-09 20:42:42 +02:00
  • 4c7bd014d9 Merge pull request #2242 from nlohmann/issue2239 Niels Lohmann 2020-07-09 15:13:12 +02:00
  • 0c4e6aa2cd ♻️ move integer conversion out of scan_number Niels Lohmann 2020-07-09 14:21:39 +02:00
  • d740622f96 📝 add documentation for macros Niels Lohmann 2020-07-09 13:23:33 +02:00
  • 251fce819c README: add explanation on how to use pkg-config. Érico Rolim 2020-07-08 17:10:51 -03:00
  • c7d18c1625 cmake: Generate and install a pkg-config file. Palmer Dabbelt 2019-08-08 14:36:27 -07:00
  • 0306525cdb Merge pull request #2251 from nlohmann/fix_2181 Niels Lohmann 2020-07-09 07:33:03 +02:00
  • f774a32d2b fix test Niels Lohmann 2020-07-08 14:47:22 +02:00
  • e3e9ccfc02 🚑 fix regression from #2181 Niels Lohmann 2020-07-08 14:02:28 +02:00
  • 1b04092c5c fix test Niels Lohmann 2020-07-08 12:38:46 +02:00
  • d019ddfcdb 👷 add code scanning Niels Lohmann 2020-07-08 12:25:53 +02:00
  • dd08f7705f Add simple test for cbor byte Matthew Bauer 2020-07-06 18:06:10 -04:00
  • 28ef87370b 🚨 fix warning Niels Lohmann 2020-07-06 13:19:06 +02:00
  • 99fc6b16ab Merge branch 'develop' of https://github.com/nlohmann/json into issue2239 Niels Lohmann 2020-07-06 12:52:59 +02:00
  • ba8174041e add test case for JSON_ASSERT Niels Lohmann 2020-07-06 12:52:48 +02:00
  • efcc826ecb 🚨 fix warning Niels Lohmann 2020-07-06 12:37:39 +02:00
  • 98b1c6d302 🚩 use JSON_ASSERT(x) instead of assert(x) Niels Lohmann 2020-07-06 12:22:31 +02:00
  • b04dc055b2 Merge pull request #2233 from nlohmann/issue2175 Niels Lohmann 2020-07-06 07:58:52 +02:00
  • 197c3d4fb0 Merge pull request #2232 from nlohmann/ignore_documentation Niels Lohmann 2020-07-06 07:58:28 +02:00
  • 803c16e5af Clean-up unintended changes to whitespace Agustín F. Pozuelo 2020-07-03 10:26:05 +01:00
  • 25f5d75e6e Fix compilation for xcode 9.x Agustín F. Pozuelo 2020-07-03 01:44:18 +01:00
  • 93770467a1 Precisely 4 template arguments for the sake of clang 3.6 (?) Agustín F. Pozuelo 2020-07-03 01:28:54 +01:00
  • 0fc261f0f2 Make ordered_map compatible with GCC 5.5 Agustín F. Pozuelo 2020-07-03 00:33:31 +01:00
  • e54f03f73b Tag binary values in cbor if set Matthew Bauer 2020-07-02 17:40:02 -04:00
  • f59f4a2b61 💚 fix build Niels Lohmann 2020-06-30 19:55:40 +02:00
  • c7e079cc98 🚑 add specialization of get_to #2175 Niels Lohmann 2020-06-30 14:26:52 +02:00
  • ad6eadeb70 📝 refine documentation of error_handler parameter Niels Lohmann 2020-06-30 13:59:43 +02:00
  • 49f26a0250 Have 4 template parameters for ordered_map gatopeich 2020-06-29 17:32:55 +01:00
  • eb7376bb13 Merge pull request #2225 from nlohmann/issue2175 Niels Lohmann 2020-06-29 14:41:09 +02:00
  • 470f7c0c68 📝 add documentation Niels Lohmann 2020-06-29 13:43:06 +02:00
  • 1b4ea8f89b Merge pull request #2224 from nlohmann/issue2221 Niels Lohmann 2020-06-28 15:08:18 +02:00
  • d7a2956b24 🔀 merge from develop Niels Lohmann 2020-06-27 13:16:20 +02:00
  • ac3922c7aa Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows Niels Lohmann 2020-06-27 13:14:48 +02:00
  • fa9f4040df 🔥 remove unused typedefs #2221 Niels Lohmann 2020-06-27 13:07:02 +02:00
  • 5ba0f65c34 🔧 remove feature request template Niels Lohmann 2020-06-27 12:55:41 +02:00
  • aefa0b3e86 🔧 use Github discussions for questions Niels Lohmann 2020-06-27 12:54:42 +02:00
  • 3948b5b091 Merge pull request #2212 from nlohmann/comments Niels Lohmann 2020-06-27 12:44:51 +02:00
  • 1af4f5f360 Merge pull request #2222 from alexreinking/patch-1 Niels Lohmann 2020-06-27 12:43:52 +02:00
  • c5ee222982 Merge pull request #2211 from nlohmann/fix_warnings Niels Lohmann 2020-06-27 12:34:18 +02:00
  • ec43371e07 Enable CMake policy CMP0077 Alex Reinking 2020-06-26 11:47:36 -07:00
  • 635b9a0ae4 Merge pull request #2193 from dota17/issue#2059 Niels Lohmann 2020-06-24 11:46:48 +02:00
  • cf18ba2394 Test initialization with dup keys gatopeich 2020-06-23 17:50:51 +01:00
  • 08963d6826 Revert types.md gatopeich 2020-06-23 15:48:02 +01:00
  • d08fca2bb9 Use const Key in ordered map (forgotten in previous commit!) gatopeich 2020-06-23 15:44:46 +01:00
  • 5e7bdf1cab Roll-back to hard-coded object_t::value_type gatopeich 2020-06-23 15:39:00 +01:00
  • fb8c11f25c Re-implement ordered_map::erase, so that it can handle pair<const Key,...> gatopeich 2020-06-23 15:01:20 +01:00
  • acd748e16f Use std::map default allocator as a placeholder to extract the actual ObjectType::value_type Still fails on older compilers (GCC <= 5.5) gatopeich 2020-06-23 12:03:21 +01:00
  • 49623a75ee Revert "Using ordered_json instead of fifo_map in test-regression" gatopeich 2020-06-23 11:30:52 +01:00
  • 8575fdf9ad Merge pull request #2181 from dota17/issue#1275 Niels Lohmann 2020-06-23 09:23:03 +02:00
  • 4bfe4add20 Merge pull request #2203 from t-b/use-unsigned-indizies-for-array-index-in-json-pointer Niels Lohmann 2020-06-23 09:16:01 +02:00
  • 0ecf297457 drop std::enable_if part chenguoping 2020-06-23 09:14:55 +08:00
  • a9809f3381 🏁 revert change that breaks with MSVC Niels Lohmann 2020-06-22 23:02:28 +02:00
  • 8b3d2399a4 🚨 remove warnings Niels Lohmann 2020-06-22 22:32:21 +02:00
  • 5fe3d3929a Using ordered_json instead of fifo_map in test-regression This is more comprehensive and the "my_workaround_fifo_map" wrapper does not allow to infer value type as required in this branch. gatopeich 2020-06-22 19:10:35 +01:00
  • 064a9c9212 Fix regression test gatopeich 2020-06-22 18:59:19 +01:00
  • ddf0a45abb Use AllocatorType<ObjectType::value_type>, instead of hard-coding it for std::map's value_type gatopeich 2020-06-22 18:35:46 +01:00
  • aeef50709e to allow for ADL in int_to_string() function chenguoping 2020-06-22 20:17:56 +08:00
  • ecbb2756fd json_pointer::array_index: Use unsigned values for the array index when parsing Thomas Braun 2020-06-20 15:36:28 +02:00
  • 65e8ee985a 🔨 clean up Niels Lohmann 2020-06-22 08:59:03 +02:00
  • 15337b2cc3 Ignore allocator hardcoded to match std::map gatopeich 2020-06-22 00:03:48 +01:00
  • 27aaf6f845 Clean-up ordered_map declarations gatopeich 2020-06-21 22:28:03 +01:00
  • 29ad2178c6 Merge pull request #2176 from gracicot/cpp20-support-no-std-fct-templ-specialization Niels Lohmann 2020-06-21 20:39:58 +02:00
  • e22ce45065 🚸 improve diagnostics Niels Lohmann 2020-06-21 13:28:00 +02:00
  • 139a0258cc Merge branch 'develop' of https://github.com/nlohmann/json into comments Niels Lohmann 2020-06-21 12:40:21 +02:00
  • 8dade80499 Merge pull request #2202 from nlohmann/issue2189 Niels Lohmann 2020-06-21 08:41:48 +02:00
  • f0e73163f2 json_pointer.hpp: Mention more exception in documentation Thomas Braun 2020-06-20 15:25:54 +02:00
  • 0fe9f23254 add macros from #2175 Niels Lohmann 2020-06-20 14:11:37 +02:00
  • 6ee9e5f402 ⚗️ remove const from value type Niels Lohmann 2020-06-20 13:23:44 +02:00
  • 24992003d9 📝 add notes from #2189 Niels Lohmann 2020-06-20 09:55:11 +02:00
  • e4675887a6 Merge branch 'develop' of https://github.com/nlohmann/json into issue2189 Niels Lohmann 2020-06-20 09:47:12 +02:00
  • 74c6e4295f Merge pull request #2201 from nlohmann/issue2196 Niels Lohmann 2020-06-20 09:31:02 +02:00
  • 4fd0d02b6f 🚧 toward an ordered_json type Niels Lohmann 2020-06-19 15:27:05 +02:00
  • b64002bbca ♻️ extract common code to function Niels Lohmann 2020-06-19 13:24:08 +02:00
  • 0585ecc56b add tests for comment skipping Niels Lohmann 2020-06-19 13:10:35 +02:00
  • cd115cbc33 update test suite Niels Lohmann 2020-06-18 12:50:32 +02:00
  • 74520d8bb0 🚧 extend API Niels Lohmann 2020-06-17 22:03:14 +02:00
  • 88a37010d6 🐛 serialize 32-bit floating-point numbers as float 32 in MessagePack (0xCA) #2196 Niels Lohmann 2020-06-17 21:14:23 +02:00
  • e9bfcf7255 improve comment parsing Niels Lohmann 2020-06-17 14:59:47 +02:00
  • 4a6c68c7eb drop new blank line chenguoping 2020-06-17 20:44:31 +08:00
  • da8fa3535a drop testcase chenguoping 2020-06-17 20:41:31 +08:00