1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-29 23:01:16 +03:00
Commit Graph

1922 Commits

Author SHA1 Message Date
bb752fd30c move json_reverse_iterator outside of basic_json 2017-07-09 21:30:33 +02:00
0ba98b6fe0 move internal_iterator/iter_impl/iteration_proxy outside of basic_json 2017-07-09 21:30:31 +02:00
00d6e27194 move primitive_iterator outside of basic_json 2017-07-09 21:22:16 +02:00
8e681d1e57 move lexer/parser outside of basic_json 2017-07-09 21:22:15 +02:00
15625ca4a7 move input adapters outside of basic_json 2017-07-09 21:21:12 +02:00
a332142194 move json_pointer outside of basic_json 2017-07-09 21:21:09 +02:00
fe086d7432 forward declare basic_json, add two macros
Those macros are used to reduce template argument boilerplate
2017-07-09 16:16:42 +02:00
d3496347fc 👷 removing Clang 3.9 and 4.0
These versions are still not working properly: https://travis-ci.org/nlohmann/json/jobs/251675281
2017-07-09 12:19:14 +02:00
504012a3db 📝 cleanup after #650
As <iostream> is not included in json.hpp any more, all code examples need to include <iostream> now.
2017-07-09 11:51:38 +02:00
a0e0579374 Merge pull request #650 from olegendo/develop
Don't include <iostream>, use std::make_shared
2017-07-09 11:12:46 +02:00
1b2fabe802 👷 adding two recent Clang versions
Maybe the simple approach is working now - at least it is in https://github.com/taocpp/PEGTL/blob/master/.travis.yml
2017-07-09 11:10:18 +02:00
e3bb156f82 fix typo 2017-07-09 15:20:28 +09:00
b753cb6ee7 use std::make_shared 2017-07-09 15:19:08 +09:00
f0ca96d462 include <iosfwd> instead of <iostream>
avoid bloat caused by <iostream> and std::cout and friends in apps where
iostream are not used.
2017-07-09 15:04:49 +09:00
f1c543cb7b 👷 added GCC7 2017-07-08 22:59:19 +02:00
7b05e1a687 🔨 improved performance in dump for deeply nested values 2017-07-08 22:59:04 +02:00
f697fec522 📝 fixed documentation
There was an issue in the documentation example before. Unfortunately, I did not recreate the example outputs.
2017-07-08 22:16:45 +02:00
87bccbc335 🔨 removed exception parse_error.111
It makes no sense to have this special exception. Instead of throwing when an input adapter is created, it is better to detect a parse error in later usage when an EOF is "read" unexpectedly.
2017-07-08 21:35:13 +02:00
b38ecb5ca9 🔨 simplified binary write
Also added some comments and improved the documentation.
2017-07-08 20:31:13 +02:00
b3ac36db93 🔨 excluded uncovered lines
These breaks were just added to silence a GCC warning - the GCC is right about warning as it cannot know that the expect function will not return in these two scenarios.
2017-07-08 18:34:08 +02:00
e67df7c385 Merge branch 'feature/undo_171' into develop 2017-07-08 16:34:00 +02:00
552622343e 📝 fixed typos 2017-07-08 16:18:27 +02:00
566f6dcf30 🔥 removing usused functions #645
It seems these functions are not required any more. The code was added in commit 7e32457 to fix issue #171. There are still regression tests for #171, so when this commit passes the CI, the functions may be removed for good.
2017-07-08 13:33:13 +02:00
6f12749ef6 📝 added version string for Xcode 9 2017-07-08 12:55:05 +02:00
ac42333749 ⬆️ Catch v1.9.6 2017-07-08 12:11:45 +02:00
015c88783e 🔨 fixed a pedantic warning 2017-07-08 12:03:12 +02:00
df2feabb72 👷 added Xcode 9 beta
See https://twitter.com/travisci/status/880550780368855040
2017-07-08 11:57:09 +02:00
63ecbfd36b re-added test
I have no idea why this test has been removed in the first place.
2017-07-07 23:38:04 +02:00
07b78c993c 🐛 fixed undefined behavior bug
When an empty vector was passed to the parse function, an empty iterator range was used to construct an input iterator. Unfortunately, we then cannot use the start iterator to derive a pointer from.

Found with Xcode's undefined behavior sanitizer.
2017-07-07 23:37:16 +02:00
8b123107c0 🔨 fixed some pedantic GCC warnings 2017-07-07 22:41:22 +02:00
32065c8045 📝 fix for #639
Removed deprecated documentation of the comparison operator.
2017-07-07 21:16:33 +02:00
e99b783def 🔨 simplifying scanner 2017-06-22 16:40:15 +02:00
3dc5d95422 Merge branch 'develop' of https://github.com/nlohmann/json into develop 2017-06-21 18:55:28 +02:00
b9a8425cc8 📝 cleanup after #629 and #630 2017-06-21 18:55:25 +02:00
5ee651c387 Merge pull request #630 from Chocobo1/doc_neq
fix typo in operator__notequal example
2017-06-21 18:54:18 +02:00
dad6051f37 Merge pull request #629 from Chocobo1/c4819
Fix MSVC warning C4819
2017-06-21 18:54:03 +02:00
4b5433578a added progress output for Unicode tests
Travis aborts tests if they do not produce output for 10 minutes. This commit shall fix this.
2017-06-21 18:50:11 +02:00
0395f3fdfb fix typo 2017-06-21 21:41:34 +08:00
66ffac9e8a Fix MSVC warning C4819
Replace unicode whitespaces by ASCII whitespace 0x20
2017-06-21 16:17:10 +08:00
6f3bebff5c 🔨 removed unexpect function 2017-06-21 07:26:50 +02:00
2fd214c14b 🔨 adjusted pedantic flags 2017-06-20 23:05:37 +02:00
e7695306f1 🔨 fixed a warning 2017-06-20 22:58:02 +02:00
84f2e64a7c improved coverage 2017-06-20 22:35:31 +02:00
9add24ff10 🔨 fixed a warning 2017-06-20 22:20:41 +02:00
2f007ca092 improved coverage 2017-06-20 22:03:36 +02:00
a5c27ede32 🔨 fixed a warning 2017-06-20 21:39:36 +02:00
7c2a187258 improved test coverage 2017-06-20 21:09:26 +02:00
e191dd833f 🔨 fixed warning about pointer members 2017-06-20 21:09:05 +02:00
82b95ca664 🔨 simplified error handling in parser 2017-06-20 20:14:18 +02:00
f2cdb3d594 ⬆️ Catch v1.9.5 2017-06-20 20:13:56 +02:00