Commit Graph

  • b9a8425cc8 📝 cleanup after #629 and #630 Niels Lohmann 2017-06-21 18:55:25 +02:00
  • 5ee651c387 Merge pull request #630 from Chocobo1/doc_neq Niels Lohmann 2017-06-21 18:54:18 +02:00
  • dad6051f37 Merge pull request #629 from Chocobo1/c4819 Niels Lohmann 2017-06-21 18:54:03 +02:00
  • 4b5433578a added progress output for Unicode tests Niels Lohmann 2017-06-21 18:50:11 +02:00
  • 0395f3fdfb fix typo Chocobo1 2017-06-21 21:41:20 +08:00
  • 66ffac9e8a Fix MSVC warning C4819 Chocobo1 2017-06-21 16:17:10 +08:00
  • 6f3bebff5c 🔨 removed unexpect function Niels Lohmann 2017-06-21 07:26:50 +02:00
  • 2fd214c14b 🔨 adjusted pedantic flags Niels Lohmann 2017-06-20 23:05:37 +02:00
  • e7695306f1 🔨 fixed a warning Niels Lohmann 2017-06-20 22:58:02 +02:00
  • 84f2e64a7c improved coverage Niels Lohmann 2017-06-20 22:35:31 +02:00
  • 9add24ff10 🔨 fixed a warning Niels Lohmann 2017-06-20 22:20:41 +02:00
  • 2f007ca092 improved coverage Niels Lohmann 2017-06-20 22:03:36 +02:00
  • a5c27ede32 🔨 fixed a warning Niels Lohmann 2017-06-20 21:39:36 +02:00
  • 7c2a187258 improved test coverage Niels Lohmann 2017-06-20 21:09:26 +02:00
  • e191dd833f 🔨 fixed warning about pointer members Niels Lohmann 2017-06-20 21:09:05 +02:00
  • 82b95ca664 🔨 simplified error handling in parser Niels Lohmann 2017-06-20 20:14:18 +02:00
  • f2cdb3d594 ⬆️ Catch v1.9.5 Niels Lohmann 2017-06-20 20:13:56 +02:00
  • c2044205ef 📝 updated used compilers Niels Lohmann 2017-06-20 16:12:14 +02:00
  • c2db4a118d 👷 update Travis to use Ubuntu Trusty 14.04 images Niels Lohmann 2017-06-19 21:51:24 +02:00
  • 70b7455a13 🔨 minor change Niels Lohmann 2017-06-19 21:50:36 +02:00
  • 4e6f548c0b Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions Niels Lohmann 2017-06-19 17:31:10 +02:00
  • 08d781058c add from_json support for std::array Théo DELRIEU 2017-06-19 12:03:38 +02:00
  • 6e4910d5c5 add pair/tuple conversions Théo DELRIEU 2017-06-17 14:24:07 +02:00
  • 112a6f4e53 🔨 replaced lexer's error message by const char* Niels Lohmann 2017-06-18 13:03:14 +02:00
  • 747f7d36d1 Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-06-18 00:00:36 +02:00
  • b79a1a2678 📝 update after #626 Niels Lohmann 2017-06-18 00:00:31 +02:00
  • 7b97100ffd Merge pull request #626 from koemeet/bugfix/vs2017-min-macro-fix Niels Lohmann 2017-06-17 23:58:13 +02:00
  • 04a1666ef2 Add parentheses around std::min so it bypasses the macro introduced by windows.h. Steffen Brem 2017-06-17 22:01:18 +02:00
  • 1fbb82de89 🔨 using std::array to buffer input Niels Lohmann 2017-06-17 20:47:53 +02:00
  • 889006f006 regression test for #600 Niels Lohmann 2017-06-17 13:37:04 +02:00
  • e1ca484bc1 📝 added note about Conan #566 Niels Lohmann 2017-06-17 11:20:09 +02:00
  • b27d2adcbe accept functions to check if input is valid JSON #458 Niels Lohmann 2017-06-16 19:23:55 +02:00
  • d415293d41 Merge pull request #615 from theodelrieu/develop Niels Lohmann 2017-06-16 18:16:20 +02:00
  • c98364834f remove std::pair support Théo DELRIEU 2017-06-13 11:11:29 +02:00
  • fd4a0ecabc Merge branch 'feature/ifstream' into develop Niels Lohmann 2017-06-13 08:41:14 +02:00
  • 88dc7c11fa 🔨 fixed a warning Niels Lohmann 2017-06-12 19:58:44 +02:00
  • afb959a083 🔨 removed nonportable code Niels Lohmann 2017-06-12 19:02:08 +02:00
  • ac793e957f 🔨 trying to fix #367 Niels Lohmann 2017-06-12 18:58:58 +02:00
  • 5fa5c17bc6 ✏️ cleanup after #595 Niels Lohmann 2017-06-10 18:29:16 +02:00
  • 6caad48e44 Merge pull request #595 from HenryRLee/iterator_arithmetic Niels Lohmann 2017-06-10 18:26:48 +02:00
  • e12c2ee6a8 Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-09 20:47:42 +10:00
  • 52f934cbbf Merge pull request #609 from theodelrieu/develop Niels Lohmann 2017-06-07 16:38:23 +02:00
  • cea39dfaa8 fix #600 Théo DELRIEU 2017-06-06 14:18:32 +02:00
  • 6661ec755b Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-07 18:01:46 +10:00
  • 0f065edff6 Revert a change in reverse iterator to pass the test cases HenryLee 2017-06-07 18:01:01 +10:00
  • 92ef19696a ✏️ cleanup after #598 Niels Lohmann 2017-06-06 20:48:11 +02:00
  • bfdf0d1ce6 Merge pull request #598 from HenryRLee/issue550 Niels Lohmann 2017-06-06 20:41:42 +02:00
  • 85de93ba93 add std::pair<CompatibleStringType, T> support Théo DELRIEU 2017-06-06 13:44:35 +02:00
  • c98169d0d5 Revert "Change iterator category to random access" HenryLee 2017-06-05 21:59:17 +10:00
  • fb91aa81da Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-05 20:24:21 +10:00
  • 2ba554e442 Merge branch 'develop' into issue550 HenryLee 2017-06-05 20:24:08 +10:00
  • 1a9d76679a 🐛 fixed the issue with GCC7 #590 Niels Lohmann 2017-06-04 18:40:32 +02:00
  • d19c5ced4b 🐛 skipping BOM for iterators #602 Niels Lohmann 2017-06-02 12:38:32 +02:00
  • c043ba6978 🔥 removed failing test #529 Niels Lohmann 2017-06-01 07:32:39 +02:00
  • f2e1643039 Add test cases for iterator to const iterator assignment HenryLee 2017-05-31 00:50:40 +10:00
  • 2d5f0c0549 Redefine the converting assignment in iterator HenryLee 2017-05-31 00:50:14 +10:00
  • c09a4cbbd7 Add test cases for iterator to const iterator conversion HenryLee 2017-05-31 00:31:16 +10:00
  • 0a51fb22ed Fix indentation HenryLee 2017-05-30 23:37:24 +10:00
  • 881cd3f420 Remove the iter_impl<const basic_json> copy constructor and copy assignment HenryLee 2017-05-30 20:57:22 +10:00
  • 790e7ca9e9 Add struct keyword in front of internal_iterator HenryLee 2017-05-30 20:27:05 +10:00
  • ce39330ff8 Add converting constructors for iterator HenryLee 2017-05-30 20:23:25 +10:00
  • c4ab8f827e Change iterator category to random access HenryLee 2017-05-30 19:44:55 +10:00
  • daea213b44 Use static cast in the implementation of the operators of reverse iterator HenryLee 2017-05-29 23:56:21 +10:00
  • 0c2ed00ebe Add missing test cases for n + it arithmetic in iterators HenryLee 2017-05-29 22:39:27 +10:00
  • 5b245dae06 Comment out the exception message check in operator[] of reverse iterator HenryLee 2017-05-29 22:19:10 +10:00
  • e42db27d6d Fix the indentation from the latest commit HenryLee 2017-05-29 20:02:58 +10:00
  • 3aef1a582e Change the definition of the operator override of reverse iterator to using the result of the base class directly HenryLee 2017-05-29 19:45:34 +10:00
  • a3bf0131c4 Fix some more reverse iterator arithmetic test codes HenryLee 2017-05-29 19:43:45 +10:00
  • adc73d6d5f Fix the arithmetic mistakes in reverse iterator HenryLee 2017-05-29 18:52:53 +10:00
  • ed62129f8e Override n + iterator operator in the iterator HenryLee 2017-05-27 13:44:14 +10:00
  • 52adf3fd5b 🔨 fixed compilation Niels Lohmann 2017-05-22 22:59:57 +02:00
  • 9a576fe1d9 added test for #367 Niels Lohmann 2017-05-22 22:49:39 +02:00
  • c7bd01edf2 🔨 trying something #367 Niels Lohmann 2017-05-22 17:06:46 +02:00
  • 9e507dfad5 tests and fix for #367 Niels Lohmann 2017-05-21 16:36:51 +02:00
  • 16b63d3197 🔨 working toward #367 Niels Lohmann 2017-05-20 12:44:13 +02:00
  • 8a35fdd8f5 🔨 overworked accept() function Niels Lohmann 2017-05-20 12:24:13 +02:00
  • 9ddc69f3a9 🐛 adjusting fix for future versions #586 Niels Lohmann 2017-05-20 10:49:06 +02:00
  • 99cb095e89 🐛 fix for #586 Niels Lohmann 2017-05-20 10:34:49 +02:00
  • 0f4131d138 Merge pull request #583 from zhaohuaxishi/doxygen_error Niels Lohmann 2017-05-15 21:09:43 +02:00
  • 0c3ffe12cd reverting first/second experiment #350 Niels Lohmann 2017-05-15 21:07:58 +02:00
  • b8dff3bc16 remove the redundant @ref command 郭荣飞 2017-05-14 07:50:26 +08:00
  • 723c875604 💬 replaced "backspace" with "backslash" #509 Niels Lohmann 2017-05-13 19:56:38 +02:00
  • dfa371c436 fix doxygen error of basic_json::get() 郭荣飞 2017-05-13 23:13:04 +08:00
  • 9b764ee5d6 🏁 fix for #581 Niels Lohmann 2017-05-13 12:27:37 +02:00
  • 978255da8c 📝 updated contribution guidelines Niels Lohmann 2017-05-13 11:57:15 +02:00
  • 8b88e1b266 Merge pull request #579 from Type1J/develop_feature_first_second Niels Lohmann 2017-05-13 11:37:57 +02:00
  • b78457b792 Making comparison operators const. Jay Sistar 2017-05-11 13:22:47 -04:00
  • 00d841bfda Adding equal and not equal operators to proxys. Jay Sistar 2017-05-11 14:50:59 +00:00
  • d6c78dacd8 Fixing assignement for iterator wrapper second, and adding unit test Jay Sistar 2017-05-10 17:53:27 +00:00
  • 5beea35443 Merge pull request #578 from Type1J/develop_feature_first_second Niels Lohmann 2017-05-10 17:25:54 +02:00
  • 15ef9b8a35 Merge pull request #576 from Type1J/develop Niels Lohmann 2017-05-10 16:32:14 +02:00
  • 6a656ed375 Adding first and second properties to iteration_proxy_internal Jay Sistar 2017-05-10 13:20:52 +00:00
  • 2afbd33472 🔨 working on #367 Niels Lohmann 2017-05-10 12:06:24 +02:00
  • 87744fd594 Missed one. Jay Sistar 2017-05-09 02:04:02 +00:00
  • 0719287e44 Reducing chatter about Meson. Jay Sistar 2017-05-09 02:01:55 +00:00
  • 31fe2f5825 Adding support for Meson. Jay Sistar 2017-05-08 13:35:00 +00:00
  • 962da00171 implemented an indentation character #520 Niels Lohmann 2017-05-07 19:27:40 +02:00
  • fba1bcdd0b 🐛 fixing #575 Niels Lohmann 2017-05-07 13:41:48 +02:00
  • 56ac7908f1 Merge branch 'feature/manual_lexer' into develop Niels Lohmann 2017-05-05 18:27:56 +02:00
  • dbcb032f22 Merge branch 'develop' into feature/manual_lexer Niels Lohmann 2017-05-05 16:48:47 +02:00