1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-27 00:41:05 +03:00
Commit Graph

793 Commits

Author SHA1 Message Date
daea213b44 Use static cast in the implementation of the operators of reverse iterator 2017-05-29 23:56:21 +10:00
e42db27d6d Fix the indentation from the latest commit 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 2017-05-29 19:45:34 +10:00
adc73d6d5f Fix the arithmetic mistakes in reverse iterator 2017-05-29 18:52:53 +10:00
ed62129f8e Override n + iterator operator in the iterator 2017-05-27 13:44:14 +10:00
c7bd01edf2 🔨 trying something #367 2017-05-22 17:06:46 +02:00
9e507dfad5 tests and fix for #367
operator>> now works as expected.
2017-05-21 16:36:51 +02:00
16b63d3197 🔨 working toward #367 2017-05-20 12:44:13 +02:00
8a35fdd8f5 🔨 overworked accept() function
Fixed to make sure no token is "overlooked".
2017-05-20 12:24:13 +02:00
9ddc69f3a9 🐛 adjusting fix for future versions #586 2017-05-20 10:49:06 +02:00
99cb095e89 🐛 fix for #586
Also added a Travis builder with -std=c++1z
2017-05-20 10:34:49 +02:00
0f4131d138 Merge pull request #583 from zhaohuaxishi/doxygen_error
fix doxygen error of basic_json::get()
2017-05-15 21:09:43 +02:00
0c3ffe12cd reverting first/second experiment #350 2017-05-15 21:07:58 +02:00
b8dff3bc16 remove the redundant @ref command 2017-05-14 07:59:07 +08:00
723c875604 💬 replaced "backspace" with "backslash" #509 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 2017-05-13 12:27:37 +02:00
b78457b792 Making comparison operators const. 2017-05-11 13:22:47 -04:00
00d841bfda Adding equal and not equal operators to proxys. 2017-05-11 14:51:06 +00:00
d6c78dacd8 Fixing assignement for iterator wrapper second, and adding unit test 2017-05-10 17:53:27 +00:00
6a656ed375 Adding first and second properties to iteration_proxy_internal 2017-05-10 13:20:52 +00:00
2afbd33472 🔨 working on #367
Test cases succeed as expected, but the example in #367 is not fully
realized yet.
2017-05-10 12:06:24 +02:00
962da00171 implemented an indentation character #520
An optional parameter for dump() allows to set the character to use for
indentation (default: space). In case a JSON value is serialized to an
output stream, its fill character is used (and can be set with
std::setfill).
2017-05-07 19:27:40 +02:00
fba1bcdd0b 🐛 fixing #575
I forgot to consider the offset.
2017-05-07 13:41:48 +02:00
dbcb032f22 Merge branch 'develop' into feature/manual_lexer 2017-05-05 16:48:47 +02:00
8b9f51179e started working on #458
a simple acceptor function
2017-04-24 17:46:21 +02:00
2df8f12c09 🏁 another fix for MSVC #464
needed for VS2015.3 with /std:c++latest
2017-04-23 20:51:29 +02:00
e24df7eca9 📝 improved documentation 2017-04-23 15:10:40 +02:00
2a21146160 Merge branch 'develop' into feature/manual_lexer 2017-04-22 11:35:58 +02:00
db9bf953f3 🔨 improved diagnostic output 2017-04-15 10:40:10 +02:00
717106eced 🔨 templated output_adapter and used in class serializer 2017-04-14 19:49:05 +02:00
2d2b98a50a Merge branch 'develop' into feature/manual_lexer 2017-04-12 18:07:25 +02:00
d4469233ac Merge branch 'develop' into feature/insert 2017-04-12 18:01:06 +02:00
d7e57e3b73 🔨 added an output adapter for the binary writer 2017-04-09 22:13:26 +02:00
f3e43d7c6f 🔨 some cleanup 2017-04-09 21:14:51 +02:00
186a9fd44d 🔨 simplified interface for parser, lexer, and binary_reader
These classes are now constructed with an interface adapter. This moves
complexity from various places into the interface adapter class, or to
some factories which now implement the different flavors of input.

Furthermore, input adapters are kept in std::shared_ptr to avoid the
need of manual deletion.
2017-04-09 19:28:15 +02:00
e48114bbd6 🔨 check for value of _HAS_CXX17 2017-04-09 14:02:04 +02:00
628be157a2 🐛 added fix for #464 2017-04-09 13:52:04 +02:00
97a25de938 proposal for #428
This implementation forwards the iterators to std::map::insert.
2017-04-07 18:29:09 +02:00
d62d48fc48 🔀 merge branch 'develop' into feature/manual_lexer 2017-04-07 17:19:52 +02:00
90273e930c 🐛 fix for #512
We totally forgot to implement the comparison operators other than ==
and != for scalar types. Consequently, comparing a JSON value with a
scalar type led to compile errors.
2017-04-07 15:44:41 +02:00
ff72f38863 🔨 fixed another warning
Do not store eof() in a char buffer…
2017-04-06 19:54:08 +02:00
b992acc2e7 🔨 fixed a compiler warning 2017-04-05 20:39:27 +02:00
08fdfcca9a 🔨 implemented a binary writer 2017-04-04 23:17:43 +02:00
c28bf823bc 🔨 added endianess check 2017-04-04 17:30:43 +02:00
b15fc13dd1 🔨 implemented MessagePack in binary_reader 2017-04-04 16:59:19 +02:00
3a34f2d82c Merge branch 'develop' into feature/manual_lexer 2017-04-04 15:55:40 +02:00
782570d46f 🔨 cleanup 2017-04-03 22:58:46 +02:00
ea667db446 🔨 fixed compilation errors
TIL about C++:

executing m[key()]=val(); for a std::map executes

First key() then val() with Clang

First val() then key() with GCC

#wat
2017-04-03 21:53:23 +02:00
89efe627fe 🔨 a lot of restructuring
- removed uncached input stream adapter; it was too slow anyway
- implemented a class binary_read which parses CBOR based on input
adapters
- in the CBOR parser, numbers are created via memcpy to avoid undefined
behavior
2017-04-02 18:46:21 +02:00