j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 350ff4f7ce
         Merge branch 'release/3.9.1' into master master Niels Lohmann 2020-08-06 13:49:17 +0200
  • b3e5cb7f20
         🔖 set version to 3.9.1 Niels Lohmann 2020-08-06 13:45:29 +0200
  • f4155e4727
         Merge pull request #2333 from nlohmann/fallthrough Niels Lohmann 2020-08-01 15:32:21 +0200
  • 8a54617240
         Merge pull request #2332 from nlohmann/issue2330 Niels Lohmann 2020-08-01 12:29:33 +0200
  • 0326e4e2a6
         🚨 fix fallthrough warning Niels Lohmann 2020-07-31 19:24:03 +0200
  • 3888b1642a
         🐛 fix lexer to properly cope with repeated comments #2330 Niels Lohmann 2020-07-31 18:59:22 +0200
  • 1da931730a
         Merge pull request #2327 from nlohmann/issue2326 Niels Lohmann 2020-07-31 08:00:08 +0200
  • 1eedee5e4e
         Merge pull request #2319 from nlohmann/issue2315 Niels Lohmann 2020-07-31 07:59:18 +0200
  • 501ad6fc59
         📝 fix name of Homebrew formula #2326 Niels Lohmann 2020-07-30 13:31:00 +0200
  • 35daa5c00b
         Merge pull request #2320 from wx257osn2/fix-typo Niels Lohmann 2020-07-30 12:27:16 +0200
  • 2326abc547
         ♻️ split regression tests Niels Lohmann 2020-07-30 12:13:05 +0200
  • f13af83a94
         🐛 add more functions from std::map to nlohmann::ordered_map Niels Lohmann 2020-07-28 21:47:06 +0200
  • 2d3fe9d135 fix typo I 2020-07-28 21:54:53 +0900
  • e590604822
         🐛 fix a bug due to missing overloads in ordered_map container Niels Lohmann 2020-07-28 14:20:31 +0200
  • 1b8efed06f
         Merge pull request #2318 from eli-schwartz/installfix Niels Lohmann 2020-07-28 13:25:04 +0200
  • 7d01a9e875
         Merge branch 'develop' into installfix Niels Lohmann 2020-07-28 13:24:54 +0200
  • b3da8b325a
         Merge pull request #2314 from xvitaly/fix-path Niels Lohmann 2020-07-28 13:24:08 +0200
  • aa06a4761e
         cmake: install pkg-config file relative to current_binary_dir Eli Schwartz 2020-07-27 18:15:18 -0400
  • 8f9dc7eabe
         Fixed installation of pkg-config file on other than Ubuntu distributions. Vitaly Zaitsev 2020-07-27 16:54:16 +0200
  • d34771cafc
         Merge branch 'release/3.9.0' into develop Niels Lohmann 2020-07-27 15:54:39 +0200
  • 36e5ecf66d
         Merge branch 'release/3.9.0' Niels Lohmann 2020-07-27 15:54:24 +0200
  • e110667d21
         🔖 set version to 3.9.0 Niels Lohmann 2020-07-27 15:48:09 +0200
  • c006fc9bec
         📝 add more documentation Niels Lohmann 2020-07-27 14:07:13 +0200
  • 84c0c76849
         🚧 add Clang-Tidy configuration Niels Lohmann 2020-07-27 09:15:57 +0200
  • 2f05f5175c
         🚧 add Clang-Tidy configuration Niels Lohmann 2020-07-26 22:38:14 +0200
  • 1b06184f22
         👥 update list of contributors Niels Lohmann 2020-07-26 20:50:04 +0200
  • 84a899f511
         👥 update list of contributors Niels Lohmann 2020-07-26 14:54:51 +0200
  • 7a4841a42a
         📝 add binary() function to SAX documentation Niels Lohmann 2020-07-26 14:40:46 +0200
  • bbcdf18ba5
         🚚 move test utils header file Niels Lohmann 2020-07-26 14:07:34 +0200
  • e22cbacc41
         🚨 fix warning Niels Lohmann 2020-07-26 12:12:17 +0200
  • 67ed63b196
         Merge pull request #2312 from nlohmann/docs Niels Lohmann 2020-07-26 10:06:01 +0200
  • a34070d36a
         ✅ fix test for meta() function Niels Lohmann 2020-07-25 22:28:14 +0200
  • 9c75c7eace
         🔧 clean generated XML files Niels Lohmann 2020-07-25 22:04:42 +0200
  • 7bd6242f04
         📝 add more documentation Niels Lohmann 2020-07-25 22:00:28 +0200
  • 808aca41aa
         Merge pull request #2305 from AODQ/develop Niels Lohmann 2020-07-25 21:51:54 +0200
  • 63e7c40e35
         Merge pull request #2297 from nlohmann/issue2286 Niels Lohmann 2020-07-25 21:50:53 +0200
  • 1816aae862
         Merge branch 'develop' of https://github.com/nlohmann/json into docs Niels Lohmann 2020-07-25 21:48:51 +0200
  • 980f8c6f61
         🔀 merge develop branch Niels Lohmann 2020-07-25 21:45:47 +0200
  • 42f8708940
         Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-25 21:44:58 +0200
  • 40b78d3847
         Merge pull request #2308 from nlohmann/cbor_tags Niels Lohmann 2020-07-25 19:43:11 +0200
  • fad14aabe7
         📝 update output of meta function Niels Lohmann 2020-07-25 14:41:06 +0200
  • 6e5be17b62
         📝 add more documentation Niels Lohmann 2020-07-25 14:40:50 +0200
  • 62f98b7537
         Merge branch 'develop' of https://github.com/nlohmann/json into docs Niels Lohmann 2020-07-25 11:20:13 +0200
  • a1dbfcd736
         Merge pull request #2306 from jwittbrodt/develop Niels Lohmann 2020-07-25 10:52:56 +0200
  • c00c3162b2
         Merge branch 'develop' into develop Niels Lohmann 2020-07-25 10:52:42 +0200
  • 448ceb2e12
         Merge pull request #2303 from nlohmann/cleanup Niels Lohmann 2020-07-25 05:41:51 +0200
  • 15ec0fe150 change c-style cast to static_cast for #2304 aodq 2020-07-24 16:21:30 -0400
  • 58167173a2
         📝 add more documentation Niels Lohmann 2020-07-24 15:25:53 +0200
  • d8d499ce9b
         📝 add more documentation Niels Lohmann 2020-07-24 14:35:52 +0200
  • 480ad529e3
         🐛 fix bug in CBOR tag handling Niels Lohmann 2020-07-24 14:18:39 +0200
  • a84370c61f
         📝 add more documentation Niels Lohmann 2020-07-24 14:04:58 +0200
  • 33662417c1
         ✅ improve coverage Niels Lohmann 2020-07-24 09:32:03 +0200
  • 0f22ed0b5b added inline to DEFINE_TYPE macro Jonas Wittbrodt 2020-07-23 19:24:21 +0200
  • 12885446d8 fixes unused variable 'ex' for #2304 aodq 2020-07-23 13:21:38 -0400
  • 3c7dc635e7
         🙈 extend ignore list Niels Lohmann 2020-07-23 14:19:57 +0200
  • 27232455c8
         📝 update documentation Niels Lohmann 2020-07-23 14:17:02 +0200
  • 59cb7674be
         📝 update documentation Niels Lohmann 2020-07-23 14:15:20 +0200
  • 0cd120f7e1
         🚨 fix UBSAN warning Niels Lohmann 2020-07-23 14:06:09 +0200
  • bba57cc4af
         🚨 fix UBSAN warning Niels Lohmann 2020-07-23 14:02:49 +0200
  • e571c67c0d
         🚨 fix implicit conversion warning when opening binary file Niels Lohmann 2020-07-23 14:02:12 +0200
  • 43e07bb92d
         Merge pull request #2301 from nlohmann/regression2281 Niels Lohmann 2020-07-23 13:14:24 +0200
  • fb22233f34
         🔊 add message if implicit conversions are switched off Niels Lohmann 2020-07-23 13:11:48 +0200
  • f9b71afebf
         🚚 unify cmake build dir names Niels Lohmann 2020-07-23 13:02:53 +0200
  • 8159091d8f
         🔀 rename variable to avoid shadowing Niels Lohmann 2020-07-23 12:58:09 +0200
  • 230dcfb7a3
         🚨 add prefix to avoid shadowing Niels Lohmann 2020-07-23 12:57:52 +0200
  • b315fe484a
         🔀 merge develop branch Niels Lohmann 2020-07-23 12:30:26 +0200
  • a33c3fdf25
         Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-23 12:30:07 +0200
  • 88122467bd
         ♻️ pull code into function Niels Lohmann 2020-07-23 12:16:18 +0200
  • a048b72fe1
         Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator Niels Lohmann 2020-07-23 08:52:51 +0200
  • 484029b51c
         Merge pull request #2299 from nlohmann/fix_warnings Niels Lohmann 2020-07-22 18:43:33 +0200
  • a6d112ffbf
         ✅ add regression test for #2281 Niels Lohmann 2020-07-22 13:39:40 +0200
  • 2301bd1177
         ✅ add regression test for #2281 Niels Lohmann 2020-07-22 13:24:07 +0200
  • c4356c68e0
         ✅ add regression test for #2281 Niels Lohmann 2020-07-22 12:38:39 +0200
  • 4d63252c6c
         ✅ add regression test for #2281 Niels Lohmann 2020-07-22 12:23:58 +0200
  • a7c4c84d68
         ✅ add regression test for #2281 Niels Lohmann 2020-07-22 12:03:37 +0200
  • 797329315a
         add a CI job for explicit conversions on every os Théo DELRIEU 2020-07-16 11:22:57 +0200
  • 74b446f5fd
         add a switch to enable implicit conversions (defaults to true) Théo DELRIEU 2020-07-16 11:11:35 +0200
  • 2cd10a7405
         Merge pull request #2300 from nlohmann/gihub_actions Niels Lohmann 2020-07-22 09:45:55 +0200
  • 6bd38a2cb9
         👷 merge Gitlab actions Niels Lohmann 2020-07-22 09:02:55 +0200
  • 8b14c9b305
         🚨 fix warnings Niels Lohmann 2020-07-21 23:00:56 +0200
  • 3bb43ecd51
         🔀 merge develop branch Niels Lohmann 2020-07-21 22:02:14 +0200
  • 3249a4d821
         Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 Niels Lohmann 2020-07-21 22:01:32 +0200
  • 96e9f66025
         🔇 remove debug output Niels Lohmann 2020-07-21 22:01:15 +0200
  • 8046754c15
         🔊 add debug output to tests Niels Lohmann 2020-07-21 12:44:38 +0200
  • b1903fff1f
         💚 fix build Niels Lohmann 2020-07-21 09:09:30 +0200
  • 1339d6b683
         🐛 add missing EOF check Niels Lohmann 2020-07-20 22:40:28 +0200
  • a9117828e1
         🚨 fix warnings Niels Lohmann 2020-07-20 22:38:00 +0200
  • 8344857764
         Merge pull request #2287 from pfeatherstone/develop Niels Lohmann 2020-07-20 21:35:55 +0200
  • 4a5277d09d
         📝 update documentation Niels Lohmann 2020-07-20 14:11:43 +0200
  • 8aa6da61dc
         🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 13:57:19 +0200
  • 7360e09830
         🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 13:12:20 +0200
  • 35b899e988 [JSON] initialise all member variables. Maybe this will shut valgrind up. std::tie probably wasn't the problem initially pf 2020-07-20 10:51:43 +0100
  • 7cf2fe149c
         🚧 support for UBJSON high-precision numbers #2286 Niels Lohmann 2020-07-20 09:42:37 +0200
  • 7660ea12f6 [JSON] drop use of std::tie and std::tupe for operator== overload. valgrind and clang < 4 complain pf 2020-07-20 08:31:56 +0100
  • 893eda8353
         Merge pull request #2294 from jprochazk/develop Niels Lohmann 2020-07-20 08:02:03 +0200
  • 678d310b85 [JSON] don't know why CHECK doesn't like "CHECK(obj1 == obj2)". So using a temporary bool. pf 2020-07-19 21:29:39 +0100
  • e83ddb185d [JSON] use CHECK from doctest pf 2020-07-19 21:25:27 +0100
  • 254f0e3cee [JSON] CHECK in doctest only accepts std::string ? Use assert statement instead. Does the job pf 2020-07-19 18:22:16 +0100
  • 578217eaa3 [JSON] doctest: need another section ? pf 2020-07-19 18:17:03 +0100
  • 6d9b2040ab [JSON] as per Nlohmann's suggestion, added unit tests for the (de)serialisation macros pf 2020-07-19 18:12:13 +0100