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

Commit graph

  • 30edcaab3a
         Merge pull request #1496 from lieff/develop Niels Lohmann 2019-03-10 22:01:52 +0100
  • 7b31e56fbf fix GCC 7.1.1 - 7.2.1 on CentOS closes https://github.com/nlohmann/json/issues/670 lieff 2019-02-25 16:38:22 +0300
  • bb22b1003f Do proper endian conversions Andreas Schwab 2019-02-21 11:55:21 +0100
  • 8aeee4f7e3
         Update README.md njlr 2019-02-25 09:44:38 +0000
  • d183bd0456 Tests for json_pointer::empty and json_pointer::parent_pointer garethsb-sony 2019-02-25 09:25:02 +0000
  • 08de9eeaca Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path) garethsb-sony 2019-02-25 09:10:45 +0000
  • 164e0e54d9 Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path garethsb-sony 2019-02-25 08:57:12 +0000
  • ddc9f201f4 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472) Laurent Stacul 2019-02-22 16:05:41 +0000
  • 21516f2bae
         Merge pull request #1491 from nickaein/patch-1 Niels Lohmann 2019-02-22 09:50:45 +0100
  • 088a245218
         Fix typo in README.ME Isaac Nickaein 2019-02-22 01:05:00 +0330
  • e326df211b
         Merge pull request #1474 from nickaein/develop Niels Lohmann 2019-02-13 13:05:21 +0100
  • c55cacee1e
         Merge pull request #1477 from nickaein/fix-doc Niels Lohmann 2019-02-13 13:03:46 +0100
  • e93f305494 Add unit-test for contains() member function Isaac Nickaein 2019-02-10 16:42:01 +0330
  • 6a5db00951 Implement contains() to check existence of a key Isaac Nickaein 2019-02-10 16:40:30 +0330
  • fb5ceb26ac Fix documentation Isaac Nickaein 2019-02-11 17:00:48 +0330
  • 46ff13d39e
         Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple Niels Lohmann 2019-02-10 21:50:12 +0100
  • eee3bc0c79
         Merge pull request #1464 from elvisoric/update_meson_install_step Niels Lohmann 2019-02-10 21:48:20 +0100
  • 5da757bbb3 Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string garethsb-sony 2019-01-31 23:39:12 +0000
  • c850e9d82d Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path garethsb-sony 2019-01-31 19:15:36 +0000
  • 45819dce54 Disable -Wmismatched-tags warning on tuple_size / tuple_element past-due 2019-01-30 12:59:50 -0500
  • 77d1d37290 Disable installation when used as meson subproject. #1463 Elvis Oric 2019-01-30 11:40:06 +0100
  • 372c4d2125
         Merge branch 'develop' into iterate-on-destruction Isaac Nickaein 2019-01-28 02:41:22 +0330
  • 68ec3eb8d6
         Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon Niels Lohmann 2019-01-25 13:36:18 +0100
  • de14b5ee2f
         Merge pull request #1455 from wythe/patch-2 Niels Lohmann 2019-01-25 13:36:07 +0100
  • cca6d0dbae
         docs: README type Mark Beckwith 2019-01-24 10:49:45 -0600
  • a06e7f5d80 JSON-pointer: add operator+() returning a new json_pointer Patrick Boettcher 2019-01-24 16:46:51 +0100
  • dc21cbb751
         remove extra semicolon Matěj Plch 2019-01-22 10:13:12 +0100
  • e89c946451
         Merge branch 'feature/nodiscard' into develop Niels Lohmann 2019-01-20 15:41:30 +0100
  • 6de4df23e4
         🐛 fixed integer overflow in dump function #1447 Niels Lohmann 2019-01-20 12:26:01 +0100
  • e17e0d031f
         Merge pull request #1446 from scinart/develop Niels Lohmann 2019-01-20 12:18:02 +0100
  • e36593e960
         🔨 trying code from https://godbolt.org/z/-tLO1K Niels Lohmann 2019-01-20 11:12:20 +0100
  • 20db020c1f move newly-added tests in unit-regression.cpp scinart 2019-01-19 11:36:50 -0500
  • d359fd3a8d
         🚧 trying nodiscard attribute #1433 Niels Lohmann 2019-01-19 17:32:23 +0100
  • b9a39b38bf
         Merge pull request #1434 from pboettch/develop Niels Lohmann 2019-01-19 17:07:36 +0100
  • 83e84446d6
         fix typo scinart 2019-01-18 20:55:01 -0500
  • 899bd94b43 flush buffer in serializer::dump_escaped case UTF8_REJECT scinart 2019-01-18 20:27:49 -0500
  • 4fd9b52fc2 Use C++11 features supported by CMake 3.1. Ivor Wanders 2019-01-16 08:21:49 -0500
  • dffae1082f
         Merge pull request #1435 from pboettch/warning-fix Niels Lohmann 2019-01-15 22:18:13 +0100
  • 851fe8a5ef
         Merge pull request #1430 from nicoddemus/conda-docs Niels Lohmann 2019-01-15 22:16:49 +0100
  • a2c074fd4d this should really fix the XCode 6/7 builds onqtam 2019-01-15 22:58:12 +0200
  • 3340162efd fixing osx builds - had forgotten to define this for the object file where the test runner is compiled onqtam 2019-01-15 22:48:37 +0200
  • 2f44ac1def moved from Catch to doctest for unit tests onqtam 2019-01-13 18:41:21 +0200
  • f0883dda8f During destruction, flatten children of objects to avoid recursion Isaac Nickaein 2019-01-15 20:28:01 +0330
  • 47fe4b9cee Add unit test for parsing deeply-nested array Isaac Nickaein 2019-01-15 20:22:11 +0330
  • d0c0d16110 🚨 fixed unused variable warning Patrick Boettcher 2019-01-15 15:21:02 +0100
  • 9225cf2f57 allow push_back() and pop_back() calls on json_pointer Patrick Boettcher 2019-01-15 14:39:06 +0100
  • b025d66eb5 Add instructions about using nlohmann/json with the conda package manager Bruno Oliveira 2019-01-14 16:57:17 -0200
  • e5753b14a8
         🚨 fixed another linter warning #1400 Niels Lohmann 2019-01-13 15:40:49 +0100
  • 5c04cc1009
         🔨 fixed includes Niels Lohmann 2019-01-13 15:31:22 +0100
  • 8e9ad346d9
         🚨 fixed another linter warning Niels Lohmann 2019-01-13 13:00:54 +0100
  • ad01736d55
         💡 improved documentation for parsing without exceptions #1405 Niels Lohmann 2019-01-13 11:46:05 +0100
  • 06731b14d7
         ⬆️ upgraded Catch and Google Benchmark Niels Lohmann 2019-01-13 11:29:39 +0100
  • daeb48b01a
         Merge pull request #1411 from nickaein/develop Niels Lohmann 2019-01-13 11:11:51 +0100
  • 29a03f465e
         Merge pull request #1414 from nickaein/mydevel-appveyor-x64 Niels Lohmann 2019-01-12 23:09:19 +0100
  • c9dd260a4c Add unit tests for dump_integer Isaac Nickaein 2019-01-01 12:49:51 -0800
  • be9b4cbd60 Add benchmark for small integers Isaac Nickaein 2019-01-01 07:45:58 -0800
  • 6503e83e74 Improve dump_integer performance by implementing a more efficient int2ascii Isaac Nickaein 2019-01-01 07:45:45 -0800
  • f16432832c
         Increase stack size for VS2017 Win x64 on Appveyor Isaac Nickaein 2019-01-12 19:27:26 +0330
  • b39f34e046
         Merge pull request #1425 from hijxf/patch-1 Niels Lohmann 2019-01-12 10:23:31 +0100
  • 7f73915d4f
         Updated year in README.md Jef LeCompte 2019-01-11 08:54:03 -0500
  • df460c96cf
         Merge pull request #1423 from skypjack/patch-1 Niels Lohmann 2019-01-10 13:52:52 +0100
  • 6546cad7bf
         Fixed broken links in the README file Michele Caini 2019-01-10 08:54:53 +0100
  • 847dd2a954
         Merge pull request #1420 from skypjack/patch-1 Niels Lohmann 2019-01-09 22:33:40 +0100
  • 937b642e0e
         📝 added description on how to use NuGet package #1132 Niels Lohmann 2019-01-09 21:08:06 +0100
  • 975dc970d1
         Merge pull request #1417 from wythe/patch-1 Niels Lohmann 2019-01-09 20:35:49 +0100
  • b8be0f64ae
         Fixed broken links to operator[]() and at() Michele Caini 2019-01-09 15:11:54 +0100
  • 619bf9c20d
         Fixed broke links to RFC7159 Michele Caini 2019-01-09 15:05:09 +0100
  • a559ff8fc6
         typo in README Mark Beckwith 2019-01-08 13:24:07 -0600
  • 2c0c2ca698 Specify target platform in generator name Isaac Nickaein 2019-01-05 14:15:33 -0800
  • 676c847c55
         Merge pull request #1409 from yann-morin-1998/yem/cmake-version Niels Lohmann 2019-01-01 17:17:38 +0100
  • e8b6b7adc1 buildsystem: relax requirement on cmake version Yann E. MORIN 2018-12-31 18:42:09 +0100
  • c682b9879b
         🚨 fixed PVS V567 warning Niels Lohmann 2018-12-30 23:00:15 +0100
  • 6f89613acd
         🚨 fixed some warnings Niels Lohmann 2018-12-23 13:56:18 +0100
  • db53bdac19
         Merge branch 'release/3.5.0' into develop Niels Lohmann 2018-12-22 00:01:28 +0100
  • cebb4e052a
         Merge branch 'release/3.5.0' Niels Lohmann 2018-12-22 00:01:18 +0100
  • 78348afeb6
         🔖 set version to 3.5.0 Niels Lohmann 2018-12-21 23:52:29 +0100
  • 1107f8cd82
         📝 updated documentation for items() function Niels Lohmann 2018-12-21 22:51:12 +0100
  • 98f4e31c3e
         📝 formatted picture Niels Lohmann 2018-12-21 18:33:46 +0100
  • 58c269b039
         📝 updated documentation Niels Lohmann 2018-12-21 18:27:56 +0100
  • 2182157dc1
         📝 update documentation Niels Lohmann 2018-12-21 09:32:35 +0100
  • 45f5611d9b
         🚨 fixed two warnings Niels Lohmann 2018-12-20 22:41:48 +0100
  • 117c1d14fb
         📝 added contributors to 3.5.0 Niels Lohmann 2018-12-20 22:20:47 +0100
  • d584ab269a
         🎨 fixed header Niels Lohmann 2018-12-20 21:58:16 +0100
  • 45a8a093d7
         🚨 fixed a warning Niels Lohmann 2018-12-20 21:40:47 +0100
  • 85849940ba
         Merge pull request #1391 from pratikpc/develop Niels Lohmann 2018-12-20 08:58:08 +0100
  • ebd3f45808 Added Support for Structured Bindings Pratik Chowdhury 2018-12-19 20:17:35 +0530
  • 4f270e38cc
         Merge pull request #1342 from davedissian/bugfix/sfinae-iterator-traits Niels Lohmann 2018-12-19 08:24:18 +0100
  • f1080d7c39 Code review. David Avedissian 2018-12-18 20:44:37 +0000
  • 5d390e91ff
         Merge pull request #1392 from mtalliance/feature/addFileInputAdapter Niels Lohmann 2018-12-16 22:10:03 +0100
  • c1c85b025c Forget one std::FILE Jonathan Dumaresq 2018-12-14 07:33:28 -0500
  • 635a4fc344 use namespace std when possible. Change the name of private variable. Jonathan Dumaresq 2018-12-12 16:33:25 -0500
  • cf31193de2 create single json.hpp file Jonathan Dumaresq 2018-12-12 14:46:52 -0500
  • a794cfdba3 refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that Jonathan Dumaresq 2018-12-12 14:46:17 -0500
  • 91ff96a737 remove the const attribute Jonathan Dumaresq 2018-12-12 14:16:12 -0500
  • b7a2642fba remove comment Jonathan Dumaresq 2018-12-12 14:15:49 -0500
  • fa7f1a524e new unified json.hpp generated with make amalgamate Jonathan Dumaresq 2018-12-12 10:19:22 -0500
  • ef283e0cf8 add tests to cover the new input adapter Jonathan Dumaresq 2018-12-12 10:18:37 -0500
  • 3335da622a remove non usefull code. Jonathan Dumaresq 2018-12-12 09:32:52 -0500
  • ae48acbb23 remove non usefull code. Add small description Jonathan Dumaresq 2018-12-12 09:28:42 -0500
  • 52f6fd1d91 Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library. Jonathan Dumaresq 2018-12-11 13:17:13 -0500