Commit Graph

  • 9289a23a76 Merge pull request #1643 from kevinlul/develop Niels Lohmann 2019-07-01 22:57:04 +02:00
  • 90798caa62 🚚 rename Hedley macros Niels Lohmann 2019-07-01 22:37:30 +02:00
  • 025f4cea42 🚨 fix warning Niels Lohmann 2019-07-01 22:29:21 +02:00
  • 897362191d 🔨 add NLOHMANN_JSON prefix and undef macros Niels Lohmann 2019-07-01 22:24:39 +02:00
  • 1720bfedd1 ⚗️ add Hedley annotations Niels Lohmann 2019-06-30 22:14:02 +02:00
  • e616d095ab Remove boolean regression test for #1642 kevinlul 2019-06-30 11:57:57 -04:00
  • 1be63431f3 make emplace_back return a reference #1609 Niels Lohmann 2019-06-30 12:19:41 +02:00
  • 258fa798f1 add contains function for JSON pointers Niels Lohmann 2019-06-30 10:03:08 +02:00
  • 855156b5e8 Add regression tests for #1642 kevinlul 2019-06-29 19:26:38 -04:00
  • 9a775bcb14 Merge pull request #1570 from nickaein/msvc-regression-tests Niels Lohmann 2019-06-25 07:05:53 +02:00
  • 5b2e2305a0 CI: Skip test-unit_all on MSVC Debug builds Isaac Nickaein 2019-06-24 20:11:56 +04:30
  • 3db14cbfae 📝 Improve doc on const_inter constructor Isaac Nickaein 2019-06-24 15:40:01 +04:30
  • 0a137b78ac Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake Isaac Nickaein 2019-06-22 21:05:15 +04:30
  • f559142008 Appveyor: Set build mode explicitly Isaac Nickaein 2019-06-22 20:48:02 +04:30
  • eba8244ead Avoid collision of ::max with windows.h macro Isaac Nickaein 2019-06-22 02:33:13 +04:30
  • 798e83a038 Workaround msvc2015 bug with explicit copy-constructor for const_iterator Isaac Nickaein 2019-06-21 23:16:42 +04:30
  • d28b4b900e Add a separate build with Windows.h included Isaac Nickaein 2019-05-21 17:26:30 +04:30
  • 4ac0fe2628 Increase timeout of test-unicode_all in Debug build Isaac Nickaein 2019-04-22 08:16:10 +04:30
  • ec43d27f9f Add Debug builds for AppVeyor Isaac Nickaein 2019-04-22 08:15:53 +04:30
  • 39011a1759 📝 mention json type in documentation start page #1616 Niels Lohmann 2019-06-22 09:54:59 +02:00
  • 3b82a350ed 📝 mention 302 exception in value() documentation #1601 Niels Lohmann 2019-06-22 09:44:12 +02:00
  • 13d4f8f5ad Merge pull request #1639 from taylorhoward92/develop Niels Lohmann 2019-06-22 09:25:02 +02:00
  • f4fca2d59a Fix #1642 kevinlul 2019-06-16 18:22:40 -04:00
  • 2f389cdde7 Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3 Taylor Howard 2019-06-16 14:49:01 +10:00
  • 4fc98e0b34 Merge pull request #1625 from nickaein/fix-docs Niels Lohmann 2019-06-05 20:25:48 +02:00
  • 0c214949f5 ✏️ Fix links to create an issue page Isaac Nickaein 2019-06-04 11:27:10 +04:30
  • b22c577e83 ✏️ Fix brew instructions in README Isaac Nickaein 2019-06-04 11:25:44 +04:30
  • 0d55ddc5bf ✏️ Fix a typo in README Isaac Nickaein 2019-06-04 11:24:22 +04:30
  • 17c0849a63 Merge pull request #1585 from Macr0Nerd/iss916 Niels Lohmann 2019-05-24 09:20:15 +02:00
  • 9f2179deb1 Merge pull request #1598 from nickaein/patch-2 Niels Lohmann 2019-05-24 09:16:38 +02:00
  • 40c3d5024a Fix broken links to documentation Isaac Nickaein 2019-05-12 22:04:01 +04:30
  • 26952500b8 Merge branch 'iss916' of https://github.com/Macr0Nerd/json into iss916 Macr0Nerd 2019-04-26 18:15:52 -05:00
  • aa4c45ee4d Added to_string (with ugly macro) and tests Macr0Nerd 2019-04-25 22:12:15 -05:00
  • 293cd6b794 Added to_string and added basic tests Macr0Nerd 2019-04-25 22:12:15 -05:00
  • ee4028b8e4 Merge branch 'feature/fastcov' into develop Niels Lohmann 2019-04-06 09:15:43 +02:00
  • cf6b6692aa Merge branch 'develop' into feature/fastcov Niels Lohmann 2019-04-06 09:03:35 +02:00
  • f0bc16d899 🔨 overworked coverage targets Niels Lohmann 2019-04-06 09:02:17 +02:00
  • b4b06d89b5 ⬆️ updated fastcov Niels Lohmann 2019-04-06 00:24:19 +02:00
  • e65cff2a8f 🔨 small cleanup Niels Lohmann 2019-04-05 23:31:04 +02:00
  • 63fe1cbbcf 📝 updated README Niels Lohmann 2019-04-05 18:29:57 +02:00
  • 0bdadb12c7 Merge branch 'feature/circleci' into develop Niels Lohmann 2019-04-05 17:50:48 +02:00
  • 0a1ddd6882 ⬆️ updated fastcov Niels Lohmann 2019-04-05 07:54:46 +02:00
  • 4676f759e8 ⬆️ updated fastcov Niels Lohmann 2019-04-04 09:50:27 +02:00
  • da279234d5 Merge branch 'develop' into feature/fastcov Niels Lohmann 2019-04-04 09:03:11 +02:00
  • f05614b240 🏗️ adding anonymous namespace Niels Lohmann 2019-04-04 08:56:36 +02:00
  • 0da99027b7 🚨 silenced a warning Niels Lohmann 2019-04-03 17:44:09 +02:00
  • 1f03395e2c Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-04-03 17:28:50 +02:00
  • 2f9095ddab 🔨 relaxed requirements to coverage Niels Lohmann 2019-04-03 17:28:47 +02:00
  • ee8732c359 Merge pull request #1555 from theodelrieu/fix/1511 Niels Lohmann 2019-04-03 17:24:25 +02:00
  • d1ef75316e Merge pull request #1439 from onqtam/doctest Niels Lohmann 2019-04-03 17:01:48 +02:00
  • d66abda4ee tests: fix coverage Théo DELRIEU 2019-04-03 12:34:15 +02:00
  • e6e6805c6c add built-in array support in get_to Théo DELRIEU 2019-04-01 13:32:06 +02:00
  • 2806b201a8 make sure values are overwritten in from_json overloads Théo DELRIEU 2019-04-01 13:09:38 +02:00
  • da5b7833a0 fixing the remaining of the pedantic gcc/clang target warnings onqtam 2019-03-31 13:57:44 +03:00
  • 64873fb5b8 Merge branch 'develop' into doctest Viktor Kirilov 2019-03-30 23:23:33 +02:00
  • 80daa19331 👷 Ninja seems not to work Niels Lohmann 2019-03-30 17:39:50 +01:00
  • 0a57c51a69 👷 adding concurrency Niels Lohmann 2019-03-30 17:32:52 +01:00
  • a5e00f2cf7 👷 fixed path Niels Lohmann 2019-03-30 17:19:27 +01:00
  • 5ebe722045 👷 full workflow Niels Lohmann 2019-03-30 17:14:50 +01:00
  • ecf4d5e91d 👷 trying CircleCI Niels Lohmann 2019-03-30 17:05:43 +01:00
  • 53001414c7 🔨 using --exclude-gcov to exclude files Niels Lohmann 2019-03-30 17:00:30 +01:00
  • b12287b362 ⚗️ trying fastcov Niels Lohmann 2019-03-30 09:12:32 +01:00
  • b21c04c938 🔥 removed unsupported flag Niels Lohmann 2019-03-29 17:34:58 +01:00
  • c7878173f9 🔨 minor changes to maintainer targets Niels Lohmann 2019-03-29 13:10:11 +01:00
  • b52c3638f5 Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang Niels Lohmann 2019-03-29 09:14:25 +01:00
  • d21d298397 🎨 fixed indentation Niels Lohmann 2019-03-28 14:23:26 +01:00
  • 23635704c3 ⬆️ added script to update cpplint Niels Lohmann 2019-03-28 14:23:07 +01:00
  • 191aa0fd6f 🔧 overworked maintaner targets Niels Lohmann 2019-03-28 14:22:48 +01:00
  • 5ccdaf643f Remove C++17 extension warning from clang; #1535 Watal M. Iwasaki 2019-03-28 14:38:58 +09:00
  • b4def6dcba tabs instead of spaces... onqtam 2019-03-27 01:13:10 +02:00
  • a0000c3235 finished the last of the warnings onqtam 2019-03-27 01:09:47 +02:00
  • 5d511a6e96 fixed a bunch of warnings from the Makefile from the root of the repo onqtam 2019-03-27 00:58:53 +02:00
  • 82af0ecdc1 Merge branch 'develop' into doctest Viktor Kirilov 2019-03-26 23:32:32 +02:00
  • d79c16801a Merge branch 'feature/doozer' into develop Niels Lohmann 2019-03-26 10:49:56 +01:00
  • 24d91cf36f 📝 added Doozer to README Niels Lohmann 2019-03-26 10:49:14 +01:00
  • 0991824584 👷 version output Niels Lohmann 2019-03-26 10:41:05 +01:00
  • 0caf986505 reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support onqtam 2019-03-25 22:04:37 +02:00
  • 9d2f0391e0 👷 fixed timeout Niels Lohmann 2019-03-25 12:30:45 +01:00
  • af9da22b87 👷 adding xenial-armhf Niels Lohmann 2019-03-25 07:15:03 +01:00
  • 0a67b51fce 👷 forgot path to ctest Niels Lohmann 2019-03-25 07:03:41 +01:00
  • e27b282033 👷 skip certificate check Niels Lohmann 2019-03-25 06:45:35 +01:00
  • cde0b24389 👷 fixed required packages Niels Lohmann 2019-03-25 06:43:14 +01:00
  • f091fe31bc 👷 increased timeout Niels Lohmann 2019-03-25 06:39:41 +01:00
  • 28dfbedda7 👷 fixed timeout Niels Lohmann 2019-03-24 18:14:59 +01:00
  • ff51a32be1 updated doctest to version 2.3.1 released today onqtam 2019-03-24 17:28:52 +02:00
  • 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest onqtam 2019-03-24 17:21:44 +02:00
  • dcbc028b5b 👷 fixed syntax Niels Lohmann 2019-03-24 09:02:46 +01:00
  • 842d42b135 👷 unified paths Niels Lohmann 2019-03-24 09:02:06 +01:00
  • 1e86976cfe 👷 fixed paths Niels Lohmann 2019-03-24 08:53:30 +01:00
  • 30211477b7 👷 fixed package name Niels Lohmann 2019-03-24 08:36:01 +01:00
  • 5e1cae0a7d 👷 install g++ Niels Lohmann 2019-03-24 08:24:50 +01:00
  • c871c9a01c 👷 install correct g++ Niels Lohmann 2019-03-24 06:51:10 +01:00
  • 63d619e21f 👷 need to install g++ Niels Lohmann 2019-03-24 00:48:59 +01:00
  • c94b764a6e 👷 fixed installation Niels Lohmann 2019-03-24 00:43:01 +01:00
  • 65cdccfa8a 👷 fixed syntax error Niels Lohmann 2019-03-24 00:36:46 +01:00
  • a72ac18514 👷 use recent cmake Niels Lohmann 2019-03-24 00:36:05 +01:00
  • 4327ae0bef 👷 need more recent cmake for CentOS Niels Lohmann 2019-03-24 00:15:57 +01:00
  • fabf953305 👷 fixed a typo Niels Lohmann 2019-03-24 00:12:36 +01:00
  • 6e3e2ee2e4 👷 fixed buildenv values Niels Lohmann 2019-03-24 00:11:20 +01:00
  • bc5089e803 👷 add test output to avoid timeout Niels Lohmann 2019-03-24 00:02:41 +01:00