Ryan Mulder
71597be294
add ensure_ascii parameter to dump. #330
2017-07-11 13:48:08 -04:00
Oleg Endo
cd800522e4
Rename BuildTests to JSON_BuildTests
...
This avoids potential conflicts with other libraries when the library is
built from source and included in a bigger cmake build.
2017-07-11 22:57:49 +09:00
Niels Lohmann
7dee868a42
Merge pull request #643 from theodelrieu/refacto/split_basic_json
...
Refacto/split basic json
2017-07-09 23:12:35 +02:00
Théo DELRIEU
8585d35c92
move serializer outside of basic_json
2017-07-09 21:30:34 +02:00
Théo DELRIEU
acff23efb2
move binary_{reader,writer} outside of basic_json
2017-07-09 21:30:33 +02:00
Théo DELRIEU
bb752fd30c
move json_reverse_iterator outside of basic_json
2017-07-09 21:30:33 +02:00
Théo DELRIEU
0ba98b6fe0
move internal_iterator/iter_impl/iteration_proxy outside of basic_json
2017-07-09 21:30:31 +02:00
Théo DELRIEU
00d6e27194
move primitive_iterator outside of basic_json
2017-07-09 21:22:16 +02:00
Théo DELRIEU
8e681d1e57
move lexer/parser outside of basic_json
2017-07-09 21:22:15 +02:00
Théo DELRIEU
15625ca4a7
move input adapters outside of basic_json
2017-07-09 21:21:12 +02:00
Théo DELRIEU
a332142194
move json_pointer outside of basic_json
2017-07-09 21:21:09 +02:00
Théo DELRIEU
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
Niels Lohmann
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
Niels Lohmann
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
Niels Lohmann
a0e0579374
Merge pull request #650 from olegendo/develop
...
Don't include <iostream>, use std::make_shared
2017-07-09 11:12:46 +02:00
Niels Lohmann
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
Oleg Endo
e3bb156f82
fix typo
2017-07-09 15:20:28 +09:00
Oleg Endo
b753cb6ee7
use std::make_shared
2017-07-09 15:19:08 +09:00
Oleg Endo
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
Niels Lohmann
f1c543cb7b
👷 added GCC7
2017-07-08 22:59:19 +02:00
Niels Lohmann
7b05e1a687
🔨 improved performance in dump for deeply nested values
2017-07-08 22:59:04 +02:00
Niels Lohmann
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
Niels Lohmann
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
Niels Lohmann
b38ecb5ca9
🔨 simplified binary write
...
Also added some comments and improved the documentation.
2017-07-08 20:31:13 +02:00
Niels Lohmann
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
Niels Lohmann
e67df7c385
Merge branch 'feature/undo_171' into develop
2017-07-08 16:34:00 +02:00
Niels Lohmann
552622343e
📝 fixed typos
2017-07-08 16:18:27 +02:00
Niels Lohmann
566f6dcf30
🔥 removing usused functions #645
...
It seems these functions are not required any more. The code was added in commit 7e32457#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
Niels Lohmann
6f12749ef6
📝 added version string for Xcode 9
2017-07-08 12:55:05 +02:00
Niels Lohmann
ac42333749
⬆️ Catch v1.9.6
2017-07-08 12:11:45 +02:00
Niels Lohmann
015c88783e
🔨 fixed a pedantic warning
2017-07-08 12:03:12 +02:00
Niels Lohmann
df2feabb72
👷 added Xcode 9 beta
...
See https://twitter.com/travisci/status/880550780368855040
2017-07-08 11:57:09 +02:00
Niels Lohmann
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
Niels Lohmann
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
Niels Lohmann
8b123107c0
🔨 fixed some pedantic GCC warnings
2017-07-07 22:41:22 +02:00
Niels Lohmann
32065c8045
📝 fix for #639
...
Removed deprecated documentation of the comparison operator.
2017-07-07 21:16:33 +02:00
Niels Lohmann
e99b783def
🔨 simplifying scanner
2017-06-22 16:40:15 +02:00
Niels Lohmann
3dc5d95422
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2017-06-21 18:55:28 +02:00
Niels Lohmann
b9a8425cc8
📝 cleanup after #629 and #630
2017-06-21 18:55:25 +02:00
Niels Lohmann
5ee651c387
Merge pull request #630 from Chocobo1/doc_neq
...
fix typo in operator__notequal example
2017-06-21 18:54:18 +02:00
Niels Lohmann
dad6051f37
Merge pull request #629 from Chocobo1/c4819
...
Fix MSVC warning C4819
2017-06-21 18:54:03 +02:00
Niels Lohmann
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
Chocobo1
0395f3fdfb
fix typo
2017-06-21 21:41:34 +08:00
Chocobo1
66ffac9e8a
Fix MSVC warning C4819
...
Replace unicode whitespaces by ASCII whitespace 0x20
2017-06-21 16:17:10 +08:00
Niels Lohmann
6f3bebff5c
🔨 removed unexpect function
2017-06-21 07:26:50 +02:00
Niels Lohmann
2fd214c14b
🔨 adjusted pedantic flags
2017-06-20 23:05:37 +02:00
Niels Lohmann
e7695306f1
🔨 fixed a warning
2017-06-20 22:58:02 +02:00
Niels Lohmann
84f2e64a7c
✅ improved coverage
2017-06-20 22:35:31 +02:00
Niels Lohmann
9add24ff10
🔨 fixed a warning
2017-06-20 22:20:41 +02:00
Niels Lohmann
2f007ca092
✅ improved coverage
2017-06-20 22:03:36 +02:00
