Commit Graph

  • 99ea12f304 📝 acknowledgements for #674, #678, #682, #685, and #686 Niels Lohmann 2017-08-10 06:50:34 +02:00
  • d26b3f1fe5 Merge pull request #686 from WebProdPP/patch-1 Niels Lohmann 2017-08-10 06:44:59 +02:00
  • 345846b514 Merge pull request #685 from daixtrose/patch-1 Niels Lohmann 2017-08-09 15:32:33 +02:00
  • c9509ccf97 Update json.hpp WebProdPP 2017-08-09 16:13:43 +03:00
  • 86b3d06a93 remove duplicate word Markus Werle 2017-08-09 11:56:48 +02:00
  • 6e5b895f87 Merge pull request #682 from kbthomp1/fix-intel-osx Niels Lohmann 2017-08-09 10:16:03 +02:00
  • 4b55f0ebd6 To fix compilation issue for intel OSX compiler Kyle Thompson 2017-08-08 18:43:03 -04:00
  • c90bf5e0f1 👷 removed failing builders Niels Lohmann 2017-08-08 21:26:15 +02:00
  • dd008545d1 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-08-08 19:15:49 +02:00
  • 054b0250be 👷 trying to install g++ to make clang work Niels Lohmann 2017-08-08 19:14:22 +02:00
  • ab44a50d98 Digraph warning traits 2017-08-07 14:23:48 +02:00
  • b32a6b8c75 Merge pull request #678 from DmitryKuk/develop Niels Lohmann 2017-08-05 13:42:43 +02:00
  • 19437c15de massage -> message DmitryKuk 2017-08-05 10:43:08 +03:00
  • e523312fa2 improved test coverage Niels Lohmann 2017-08-03 17:47:42 +02:00
  • d2c3592908 added test cases for update #661 Niels Lohmann 2017-08-02 22:44:58 +02:00
  • d1e13d5128 🎉 first draft for #661 Niels Lohmann 2017-08-02 22:12:41 +02:00
  • 0ea0d7d860 Merge pull request #674 from wincent/patch-1 Niels Lohmann 2017-08-01 20:21:04 +02:00
  • efdfd3aa5b replaced by-value call #673 Niels Lohmann 2017-08-01 19:37:25 +02:00
  • 391303521a Fix "not constraint" grammar in docs Greg Hurrell 2017-08-01 08:56:28 -07:00
  • 76ecb2bd60 Merge pull request #671 from dan-42/develop Niels Lohmann 2017-08-01 07:15:55 +02:00
  • db0b9732d4 DOC: add sort mentioning about support in hunter dan-42 2017-07-31 23:20:37 +02:00
  • e60002a1b3 🔨 fixed GCC warnings in #663 Niels Lohmann 2017-07-31 23:17:14 +02:00
  • 966989a3f5 CONFIG: pin cmake to enable only C++ dan-42 2017-07-31 09:49:26 +02:00
  • 850d856aae 🔨 cleanup after #663 Niels Lohmann 2017-07-30 20:30:05 +02:00
  • 3d67ec40a6 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-07-30 20:01:35 +02:00
  • 85c768084b 🔨 using emplace Niels Lohmann 2017-07-30 20:01:31 +02:00
  • 67fb517ccd Merge pull request #669 from dan-42/change_installed_cmake_include_path Niels Lohmann 2017-07-30 20:01:03 +02:00
  • 80e95844f6 Merge pull request #663 from himikof/move-construction Niels Lohmann 2017-07-30 20:00:46 +02:00
  • aad55219f8 Merge branch 'develop' into move-construction Niels Lohmann 2017-07-30 19:49:24 +02:00
  • 96dd4ffa19 🔨 simplified a call Niels Lohmann 2017-07-30 18:30:34 +02:00
  • 7737a29518 🔨 small parser performance improvements Niels Lohmann 2017-07-30 13:25:36 +02:00
  • f434942371 REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse dan-42 2017-07-29 11:59:09 +02:00
  • c819a2d732 🔨 refactored some scanner internals Niels Lohmann 2017-07-28 19:18:50 +02:00
  • 5851daa576 binary formats can be stored in std::string, std::ofstreams or std::ostringstream #477 Niels Lohmann 2017-07-28 00:21:55 +02:00
  • c136b6f200 Merge pull request #666 from effolkronium/develop Niels Lohmann 2017-07-27 20:48:56 +02:00
  • 7d51214045 implemented exception-free parser #458 #582 Niels Lohmann 2017-07-27 20:33:11 +02:00
  • a27dd3a6f6 enable_testing only if JSON_BuildTests is ON Ilya Polishchuk 2017-07-27 17:50:24 +03:00
  • 669ebf51bc 🔨 fixed an error in MSVC Niels Lohmann 2017-07-27 06:04:35 +02:00
  • 3d589fd032 🔨 fixed compilation error Niels Lohmann 2017-07-26 23:59:56 +02:00
  • e6aa700360 🔨 cleanup Niels Lohmann 2017-07-26 23:44:55 +02:00
  • 93bb71232d Move from rvalues eagerly to work around MSVC problem Nikita Ofitserov 2017-07-25 12:17:32 +03:00
  • 897879bccb Make detail::json_ref do less work by deferring moves/copies Nikita Ofitserov 2017-07-24 12:29:06 +03:00
  • 0f4978e503 Fix an actually invalid test Nikita Ofitserov 2017-07-24 01:02:03 +03:00
  • 4414f94cd5 🔨 using input/output adapters for CBOR and MessagePack Niels Lohmann 2017-07-23 23:02:24 +02:00
  • f5cae64e52 Update tests while fixing possible UB Nikita Ofitserov 2017-07-23 23:59:34 +03:00
  • 09cda57309 Support moving from rvalues in an std::initializer_list Nikita Ofitserov 2017-07-23 23:57:17 +03:00
  • cf3ca3b78c Optimize json construction from rvalue string_t/array_t/object_t Nikita Ofitserov 2017-07-23 23:50:59 +03:00
  • 7b3cbfff23 Add some tests for std::move from std::initializer_list Nikita Ofitserov 2017-07-23 23:47:15 +03:00
  • 9b1c058810 🔨 reorganized interfaces for parse/accept functions #623 Niels Lohmann 2017-07-23 18:11:34 +02:00
  • 18e0430bfe 🔨 adding destroy function to discard values Niels Lohmann 2017-07-22 22:57:22 +02:00
  • 5b5f0090a1 🔨 trying to fix the sanitizer error Niels Lohmann 2017-07-22 16:41:42 +02:00
  • d53ef95067 🔨 fixed some warnings Niels Lohmann 2017-07-22 15:33:31 +02:00
  • c7a69ae03e started working on parser with provded result reference #418 Niels Lohmann 2017-07-22 15:18:38 +02:00
  • f513c46749 🔨 further cleanup Niels Lohmann 2017-07-22 13:35:04 +02:00
  • 024fec8a9b 🔨 more cleanup using clang-tidy Niels Lohmann 2017-07-21 18:26:07 +02:00
  • a09193e967 🔨 cleanup Niels Lohmann 2017-07-20 23:01:16 +02:00
  • 21d23982ca 🐛 fix for #656 Niels Lohmann 2017-07-17 07:53:02 +02:00
  • 8a9133c6b2 Merge pull request #652 from olegendo/develop Niels Lohmann 2017-07-15 11:39:27 +02:00
  • f1fabd1ba2 📄 added code of conduct Niels Lohmann 2017-07-13 19:16:41 +02:00
  • dad4916f9e Merge pull request #654 from ryanjmulder/develop Niels Lohmann 2017-07-12 07:58:45 +02:00
  • 486f3a2d16 restore necessary comman in documentation of dump Ryan Mulder 2017-07-11 14:18:02 -04:00
  • 40461c6c55 update comment on dump to not indicate that ensure_ascii is true by default Ryan Mulder 2017-07-11 13:59:07 -04:00
  • 71597be294 add ensure_ascii parameter to dump. #330 Ryan Mulder 2017-07-11 13:41:56 -04:00
  • cd800522e4 Rename BuildTests to JSON_BuildTests Oleg Endo 2017-07-11 22:57:49 +09:00
  • 7dee868a42 Merge pull request #643 from theodelrieu/refacto/split_basic_json Niels Lohmann 2017-07-09 23:12:35 +02:00
  • 8585d35c92 move serializer outside of basic_json Théo DELRIEU 2017-07-09 17:43:59 +02:00
  • acff23efb2 move binary_{reader,writer} outside of basic_json Théo DELRIEU 2017-07-09 17:31:25 +02:00
  • bb752fd30c move json_reverse_iterator outside of basic_json Théo DELRIEU 2017-07-09 17:20:03 +02:00
  • 0ba98b6fe0 move internal_iterator/iter_impl/iteration_proxy outside of basic_json Théo DELRIEU 2017-07-09 16:53:36 +02:00
  • 00d6e27194 move primitive_iterator outside of basic_json Théo DELRIEU 2017-07-01 20:18:42 +02:00
  • 8e681d1e57 move lexer/parser outside of basic_json Théo DELRIEU 2017-07-09 16:38:24 +02:00
  • 15625ca4a7 move input adapters outside of basic_json Théo DELRIEU 2017-07-01 20:01:28 +02:00
  • a332142194 move json_pointer outside of basic_json Théo DELRIEU 2017-07-01 19:52:18 +02:00
  • fe086d7432 forward declare basic_json, add two macros Théo DELRIEU 2017-07-01 19:44:05 +02:00
  • d3496347fc 👷 removing Clang 3.9 and 4.0 Niels Lohmann 2017-07-09 12:19:14 +02:00
  • 504012a3db 📝 cleanup after #650 Niels Lohmann 2017-07-09 11:51:38 +02:00
  • a0e0579374 Merge pull request #650 from olegendo/develop Niels Lohmann 2017-07-09 11:12:46 +02:00
  • 1b2fabe802 👷 adding two recent Clang versions Niels Lohmann 2017-07-09 11:10:18 +02:00
  • e3bb156f82 fix typo Oleg Endo 2017-07-09 15:20:28 +09:00
  • b753cb6ee7 use std::make_shared Oleg Endo 2017-07-09 15:19:08 +09:00
  • f0ca96d462 include <iosfwd> instead of <iostream> Oleg Endo 2017-07-09 15:04:49 +09:00
  • f1c543cb7b 👷 added GCC7 Niels Lohmann 2017-07-08 22:59:19 +02:00
  • 7b05e1a687 🔨 improved performance in dump for deeply nested values Niels Lohmann 2017-07-08 22:59:04 +02:00
  • f697fec522 📝 fixed documentation Niels Lohmann 2017-07-08 22:16:45 +02:00
  • 87bccbc335 🔨 removed exception parse_error.111 Niels Lohmann 2017-07-08 21:35:13 +02:00
  • b38ecb5ca9 🔨 simplified binary write Niels Lohmann 2017-07-08 20:31:13 +02:00
  • b3ac36db93 🔨 excluded uncovered lines Niels Lohmann 2017-07-08 18:34:08 +02:00
  • e67df7c385 Merge branch 'feature/undo_171' into develop Niels Lohmann 2017-07-08 16:34:00 +02:00
  • 552622343e 📝 fixed typos Niels Lohmann 2017-07-08 16:18:27 +02:00
  • 566f6dcf30 🔥 removing usused functions #645 Niels Lohmann 2017-07-08 13:33:13 +02:00
  • 6f12749ef6 📝 added version string for Xcode 9 Niels Lohmann 2017-07-08 12:55:05 +02:00
  • ac42333749 ⬆️ Catch v1.9.6 Niels Lohmann 2017-07-08 12:11:45 +02:00
  • 015c88783e 🔨 fixed a pedantic warning Niels Lohmann 2017-07-08 12:03:12 +02:00
  • df2feabb72 👷 added Xcode 9 beta Niels Lohmann 2017-07-08 11:57:09 +02:00
  • 63ecbfd36b re-added test Niels Lohmann 2017-07-07 23:38:04 +02:00
  • 07b78c993c 🐛 fixed undefined behavior bug Niels Lohmann 2017-07-07 23:37:16 +02:00
  • 8b123107c0 🔨 fixed some pedantic GCC warnings Niels Lohmann 2017-07-07 22:41:22 +02:00
  • 32065c8045 📝 fix for #639 Niels Lohmann 2017-07-07 21:16:33 +02:00
  • e99b783def 🔨 simplifying scanner Niels Lohmann 2017-06-22 16:40:15 +02:00
  • 3dc5d95422 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-06-21 18:55:28 +02:00