Commit Graph
100 Commits
Author SHA1 Message Date
Niels Lohmann fd7a9f6007 💰 add sponsor 2020-09-23 19:55:03 +02:00
Niels Lohmann 1bcabd9e83 📝 fix URLs to documentation 2020-09-02 22:25:32 +02:00
Niels Lohmann d9843fc9fc 📝 add note for Intel compilers #2346 2020-08-29 12:46:47 +02:00
Niels Lohmann 14f8be11ce Merge branch 'develop' of https://github.com/nlohmann/json into hedley14 2020-08-24 16:12:11 +02:00
Niels Lohmann 9d81eedb42 📝 fix and extend documentation of discarded values 2020-08-19 20:26:30 +02:00
Niels Lohmann b386f4de0b 📝 fix and extend documentation of discarded values 2020-08-19 20:26:06 +02:00
Niels Lohmann 3be6ee3525 🚚 remove < from filename to fix Windows build 2020-08-16 21:39:40 +02:00
Niels Lohmann fe507a7ee8 🚚 remove < from filename to fix Windows build 2020-08-16 21:36:21 +02:00
Niels Lohmann 6b04f05eba 📝 add more API documentation 2020-08-16 21:23:44 +02:00
Niels Lohmann 5c4cc20ed8 📝 add more API documentation 2020-08-16 20:48:10 +02:00
Niels Lohmann a430d25f22 📝 add more API documentation 2020-08-16 14:48:48 +02:00
Niels Lohmann fb5c20134f 📝 add more API documentation 2020-08-16 14:27:26 +02:00
Niels Lohmann d8ed98a7af 📝 add more API documentation 2020-08-15 15:18:07 +02:00
Niels Lohmann 1ce0ed5a52 👷 ignore gh-pages branch in CircleCI 2020-08-14 13:58:55 +02:00
Niels Lohmann 0c2088823d 👷 ignore gh-pages branch in CircleCI 2020-08-14 13:56:42 +02:00
Niels Lohmann fb8adb8e93 👷 ignore gh-pages branch in CircleCI 2020-08-14 13:52:42 +02:00
Niels Lohmann f6c2947f1e 📝 add more API documentation 2020-08-14 13:47:54 +02:00
Niels Lohmann 0356e0c75b 📝 add more API documentation 2020-08-14 13:05:16 +02:00
Niels Lohmann 6674561d6a 📝 add more API documentation 2020-08-14 10:48:32 +02:00
Niels Lohmann 298420263b 🚚 remove quotes from filename to fix Windows build 2020-08-13 15:12:41 +02:00
Niels Lohmann dd2fb3b454 📝 add more API documentation 2020-08-13 15:03:28 +02:00
Niels Lohmann ce6adc447a 📝 add more API documentation 2020-08-13 14:04:08 +02:00
Niels Lohmann d360fec216 📝 add offline pages for docset 2020-08-13 13:35:05 +02:00
Niels Lohmann 178125ff9b 📝 add docset 2020-08-13 10:52:20 +02:00
Niels Lohmann 874f49e945 📝 add more API documentation 2020-08-12 14:29:25 +02:00
Niels Lohmann fe89049aee 📝 add more API documentation 2020-08-12 13:41:59 +02:00
Niels Lohmann 9d726c25d5 ♻️ remove "#define private public" 2020-08-12 13:30:06 +02:00
Niels Lohmann 411fc3249b ⬆️ Hedley 14 (dev branch) 2020-08-12 13:00:57 +02:00
Niels Lohmann dd8cb2acc1 🚨 remove -Wimplicit-fallthrough warning #2348 2020-08-10 20:48:39 +02:00
Niels Lohmann 4080d0b1a4 ✅ add test to compile without exceptions 2020-08-10 09:48:11 +02:00
Niels Lohmann 1b28a58280 Merge remote-tracking branch 'origin/develop' into develop 2020-08-10 09:24:25 +02:00
Niels Lohmann 824d55bf26 📝 fix documentation #1668 2020-08-10 09:24:11 +02:00
Niels Lohmann db78ac1d77 Merge branch 'release/3.9.1' into develop 2020-08-06 13:49:29 +02:00
Niels Lohmann b3e5cb7f20 🔖 set version to 3.9.1 2020-08-06 13:45:29 +02:00
Niels Lohmann 0326e4e2a6 🚨 fix fallthrough warning 2020-07-31 19:24:03 +02:00
Niels Lohmann 3888b1642a 🐛 fix lexer to properly cope with repeated comments #2330 2020-07-31 18:59:22 +02:00
Niels Lohmann 501ad6fc59 📝 fix name of Homebrew formula #2326 2020-07-30 13:31:00 +02:00
Niels Lohmann 2326abc547 ♻️ split regression tests 2020-07-30 12:13:05 +02:00
Niels Lohmann f13af83a94 🐛 add more functions from std::map to nlohmann::ordered_map 2020-07-28 21:47:06 +02:00
Niels Lohmann e590604822 🐛 fix a bug due to missing overloads in ordered_map container 2020-07-28 14:20:31 +02:00
Niels Lohmann d34771cafc Merge branch 'release/3.9.0' into develop 2020-07-27 15:54:39 +02:00
Niels Lohmann e110667d21 🔖 set version to 3.9.0 2020-07-27 15:48:09 +02:00
Niels Lohmann c006fc9bec 📝 add more documentation 2020-07-27 14:07:13 +02:00
Niels Lohmann 84c0c76849 🚧 add Clang-Tidy configuration 2020-07-27 09:15:57 +02:00
Niels Lohmann 2f05f5175c 🚧 add Clang-Tidy configuration 2020-07-26 22:38:14 +02:00
Niels Lohmann 1b06184f22 👥 update list of contributors 2020-07-26 20:50:04 +02:00
Niels Lohmann 84a899f511 👥 update list of contributors 2020-07-26 14:54:51 +02:00
Niels Lohmann 7a4841a42a 📝 add binary() function to SAX documentation 2020-07-26 14:40:46 +02:00
Niels Lohmann bbcdf18ba5 🚚 move test utils header file 2020-07-26 14:07:34 +02:00
Niels Lohmann e22cbacc41 🚨 fix warning 2020-07-26 12:12:17 +02:00
Niels Lohmann a34070d36a ✅ fix test for meta() function 2020-07-25 22:28:14 +02:00
Niels Lohmann 9c75c7eace 🔧 clean generated XML files 2020-07-25 22:04:42 +02:00
Niels Lohmann 7bd6242f04 📝 add more documentation 2020-07-25 22:00:28 +02:00
Niels Lohmann 1816aae862 Merge branch 'develop' of https://github.com/nlohmann/json into docs 2020-07-25 21:48:51 +02:00
Niels Lohmann 980f8c6f61 🔀 merge develop branch 2020-07-25 21:45:47 +02:00
Niels Lohmann 42f8708940 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286
 Conflicts:
	single_include/nlohmann/json.hpp
2020-07-25 21:44:58 +02:00
Niels Lohmann fad14aabe7 📝 update output of meta function 2020-07-25 14:41:06 +02:00
Niels Lohmann 6e5be17b62 📝 add more documentation 2020-07-25 14:40:50 +02:00
Niels Lohmann 62f98b7537 Merge branch 'develop' of https://github.com/nlohmann/json into docs 2020-07-25 11:20:13 +02:00
Niels Lohmann 58167173a2 📝 add more documentation 2020-07-24 15:25:53 +02:00
Niels Lohmann d8d499ce9b 📝 add more documentation 2020-07-24 14:35:52 +02:00
Niels Lohmann 480ad529e3 🐛 fix bug in CBOR tag handling 2020-07-24 14:18:39 +02:00
Niels Lohmann a84370c61f 📝 add more documentation 2020-07-24 14:04:58 +02:00
Niels Lohmann 33662417c1 ✅ improve coverage 2020-07-24 09:32:03 +02:00
Niels Lohmann 3c7dc635e7 🙈 extend ignore list 2020-07-23 14:19:57 +02:00
Niels Lohmann 27232455c8 📝 update documentation 2020-07-23 14:17:02 +02:00
Niels Lohmann 59cb7674be 📝 update documentation 2020-07-23 14:15:20 +02:00
Niels Lohmann 0cd120f7e1 🚨 fix UBSAN warning 2020-07-23 14:06:09 +02:00
Niels Lohmann bba57cc4af 🚨 fix UBSAN warning 2020-07-23 14:02:49 +02:00
Niels Lohmann e571c67c0d 🚨 fix implicit conversion warning when opening binary file 2020-07-23 14:02:12 +02:00
Niels Lohmann fb22233f34 🔊 add message if implicit conversions are switched off 2020-07-23 13:11:48 +02:00
Niels Lohmann f9b71afebf 🚚 unify cmake build dir names 2020-07-23 13:02:53 +02:00
Niels Lohmann 8159091d8f 🔀 rename variable to avoid shadowing 2020-07-23 12:58:09 +02:00
Niels Lohmann 230dcfb7a3 🚨 add prefix to avoid shadowing 2020-07-23 12:57:52 +02:00
Niels Lohmann b315fe484a 🔀 merge develop branch 2020-07-23 12:30:26 +02:00
Niels Lohmann a33c3fdf25 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286
 Conflicts:
	single_include/nlohmann/json.hpp
2020-07-23 12:30:07 +02:00
Niels Lohmann 88122467bd ♻️ pull code into function 2020-07-23 12:16:18 +02:00
Niels Lohmann a6d112ffbf ✅ add regression test for #2281 2020-07-22 13:39:40 +02:00
Niels Lohmann 2301bd1177 ✅ add regression test for #2281 2020-07-22 13:24:07 +02:00
Niels Lohmann c4356c68e0 ✅ add regression test for #2281 2020-07-22 12:38:39 +02:00
Niels Lohmann 4d63252c6c ✅ add regression test for #2281 2020-07-22 12:23:58 +02:00
Niels Lohmann a7c4c84d68 ✅ add regression test for #2281 2020-07-22 12:03:37 +02:00
Niels Lohmann 6bd38a2cb9 👷 merge Gitlab actions 2020-07-22 09:02:55 +02:00
Niels Lohmann 8b14c9b305 🚨 fix warnings 2020-07-21 23:00:56 +02:00
Niels Lohmann 3bb43ecd51 🔀 merge develop branch 2020-07-21 22:02:14 +02:00
Niels Lohmann 3249a4d821 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286
 Conflicts:
	single_include/nlohmann/json.hpp
2020-07-21 22:01:32 +02:00
Niels Lohmann 96e9f66025 🔇 remove debug output 2020-07-21 22:01:15 +02:00
Niels Lohmann 8046754c15 🔊 add debug output to tests 2020-07-21 12:44:38 +02:00
Niels Lohmann b1903fff1f 💚 fix build 2020-07-21 09:09:30 +02:00
Niels Lohmann 1339d6b683 🐛 add missing EOF check 2020-07-20 22:40:28 +02:00
Niels Lohmann a9117828e1 🚨 fix warnings 2020-07-20 22:38:00 +02:00
Niels Lohmann 4a5277d09d 📝 update documentation 2020-07-20 14:11:43 +02:00
Niels Lohmann 8aa6da61dc 🚧 support for UBJSON high-precision numbers #2286 2020-07-20 13:57:19 +02:00
Niels Lohmann 7360e09830 🚧 support for UBJSON high-precision numbers #2286 2020-07-20 13:12:20 +02:00
Niels Lohmann 7cf2fe149c 🚧 support for UBJSON high-precision numbers #2286 2020-07-20 09:42:37 +02:00
Niels Lohmann 7fc4b2901a 🚸 add static assertion for missing binary function in SAX interface 2020-07-17 20:41:11 +02:00
Niels Lohmann 2fd57d3ed1 ✅ add test for target_include_directories #1818 2020-07-17 14:26:22 +02:00
Niels Lohmann d047b3d495 🚨 remove linter warning 2020-07-16 14:45:39 +02:00
Niels Lohmann 26196f25f6 🔥 remove test Makefile targets (all handled by CMake) 2020-07-16 13:38:25 +02:00
Niels Lohmann 3d60befde3 🔧 adjust analysis targets 2020-07-16 12:14:06 +02:00