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
Niels Lohmann
a5c27ede32
🔨 fixed a warning
2017-06-20 21:39:36 +02:00
Niels Lohmann
7c2a187258
✅ improved test coverage
2017-06-20 21:09:26 +02:00
Niels Lohmann
e191dd833f
🔨 fixed warning about pointer members
2017-06-20 21:09:05 +02:00
Niels Lohmann
82b95ca664
🔨 simplified error handling in parser
2017-06-20 20:14:18 +02:00
Niels Lohmann
f2cdb3d594
⬆️ Catch v1.9.5
2017-06-20 20:13:56 +02:00
Niels Lohmann
c2044205ef
📝 updated used compilers
2017-06-20 16:12:14 +02:00
Niels Lohmann
c2db4a118d
👷 update Travis to use Ubuntu Trusty 14.04 images
2017-06-19 21:51:24 +02:00
Niels Lohmann
70b7455a13
🔨 minor change
2017-06-19 21:50:36 +02:00
Niels Lohmann
4e6f548c0b
Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions
...
add pair/tuple conversions
2017-06-19 17:31:10 +02:00
Théo DELRIEU
08d781058c
add from_json support for std::array
2017-06-19 12:03:38 +02:00
Théo DELRIEU
6e4910d5c5
add pair/tuple conversions
2017-06-19 10:16:37 +02:00
Niels Lohmann
112a6f4e53
🔨 replaced lexer's error message by const char*
2017-06-18 13:03:14 +02:00
Niels Lohmann
747f7d36d1
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2017-06-18 00:00:36 +02:00
Niels Lohmann
b79a1a2678
📝 update after #626
2017-06-18 00:00:31 +02:00
Niels Lohmann
7b97100ffd
Merge pull request #626 from koemeet/bugfix/vs2017-min-macro-fix
...
[BugFix] Add parentheses around std::min
2017-06-17 23:58:13 +02:00
Steffen Brem
04a1666ef2
Add parentheses around std::min so it bypasses the macro introduced by windows.h.
2017-06-17 22:01:18 +02:00
Niels Lohmann
1fbb82de89
🔨 using std::array to buffer input
2017-06-17 20:47:53 +02:00
Niels Lohmann
889006f006
✅ regression test for #600
2017-06-17 13:37:04 +02:00
Niels Lohmann
e1ca484bc1
📝 added note about Conan #566
2017-06-17 11:20:09 +02:00
Niels Lohmann
b27d2adcbe
✨ accept functions to check if input is valid JSON #458
2017-06-16 19:23:55 +02:00
Niels Lohmann
d415293d41
Merge pull request #615 from theodelrieu/develop
...
remove std::pair support
2017-06-16 18:16:20 +02:00
Théo DELRIEU
c98364834f
remove std::pair support
2017-06-13 11:11:29 +02:00
Niels Lohmann
fd4a0ecabc
Merge branch 'feature/ifstream' into develop
2017-06-13 08:41:14 +02:00
Niels Lohmann
88dc7c11fa
🔨 fixed a warning
2017-06-12 19:58:44 +02:00
Niels Lohmann
afb959a083
🔨 removed nonportable code
2017-06-12 19:02:08 +02:00
