1566ad4053
fixed compile error for #1045 ; to_json for iternation_proxy_internal was needed
2018-06-16 12:01:49 +03:00
14e6278c2f
Merge branch 'develop' of github.com:gracicot/json into develop
2018-06-04 11:18:25 -04:00
7acd90b651
Fixed check for compatible string type
2018-06-04 11:18:19 -04:00
e0e7fa39e7
Re-added external_constructor with string compatible types
2018-06-03 23:49:13 -04:00
4778c02ab5
Set MSVC version from 1514 and older
2018-06-01 14:42:25 -04:00
714c592680
Disabled implicit conversion to string_view on MSVC 15.13 and older
2018-06-01 14:22:57 -04:00
0efaf891e5
Merge pull request #1089 from theodelrieu/feature/map_conversion
...
Provide a from_json overload for std::map
2018-05-28 14:53:23 +02:00
c5e63fd684
Provide a from_json overload for std::map
...
This overload is chosen only when BasicJsonType::string_t
is not constructible from std::map::key_type.
Currently, converting a map to json treats it as an array of pairs.
fixes #1079
2018-05-28 11:06:24 +02:00
db03d09312
Merge branch 'feature/key_ref' into develop ( fixes #1098 )
2018-05-27 22:26:00 +02:00
3cdc4d784b
📝 added documentation
2018-05-27 18:07:53 +02:00
adf09726b0
Merge branch 'develop' into feature/sax2
2018-05-27 14:26:13 +02:00
481ace65c4
🔨 only calculate array index string when needed #1098
2018-05-27 12:04:22 +02:00
1c6b332dcd
👌 mitigating cppcheck bug #1101
2018-05-26 14:10:13 +02:00
90eb0a91e0
⚡ keys are now returned as const reference #1098
2018-05-26 13:26:40 +02:00
e94862a649
🚑 fixed error in callback logic
2018-05-06 19:00:49 +02:00
5ff2abb90d
Merge branch 'develop' into feature/sax2
2018-05-06 13:29:23 +02:00
ed69e50ad2
📄 added SPDX-License-Identifier
2018-05-03 17:41:45 +02:00
fa3e42f826
Merge branch 'develop' into feature/wstring
2018-04-29 13:16:12 +02:00
65b4d8251b
Fix typo in single_include, too
2018-04-17 13:02:36 +02:00
8d8f890771
💩 first try on #1045
2018-04-10 08:29:07 +02:00
cf91b4f2bb
Merge branch 'develop' into feature/wstring
2018-04-08 11:36:58 +02:00
e1ea8369ad
Merge branch 'develop' into feature/sax2
2018-04-08 09:31:59 +02:00
08a7233d1b
🚑 fixed commit 1e08654
2018-04-02 22:38:44 +02:00
1e08654f99
🔨 cleanup
2018-04-02 22:25:17 +02:00
aa89c5e048
🔨 removing unget_character() function from input adapters #834
2018-04-02 21:10:48 +02:00
16c5bfeaad
👌 fixed compiler warnings #1031
2018-04-02 13:01:56 +02:00
eb06d0531a
🚧 added input adapter for wide strings #1031
2018-04-01 19:12:36 +02:00
ba6edd5634
🔨 cleanup
2018-03-30 00:38:18 +02:00
850671b9f1
🔨 using a vector<bool> for the parser hierarchy
2018-03-29 18:45:43 +02:00
53d8d57921
Amalgamate single include
2018-03-29 01:03:36 -04:00
5f723bbec6
🔨 realized callback parser wirh SAX interface #971
2018-03-28 23:39:39 +02:00
896a9db461
🔨 improved code #1021
2018-03-28 19:37:21 +02:00
a9baab76c2
🚑 fix for #1021
2018-03-28 18:20:55 +02:00
4f6b2b6429
🔨 changed SAX interface
2018-03-21 20:12:06 +01:00
9e1abb4842
✅ improved coverage
2018-03-20 22:39:08 +01:00
25f56ff207
📝 updated documentation
2018-03-20 19:22:18 +01:00
99ecca55c4
✅ improved test coverage
2018-03-20 18:49:10 +01:00
9e07e9b4ec
✨ implemented non-throwing binary reader
2018-03-19 22:48:13 +01:00
a271ee5f16
♻️ proper use of SAX parser for binary formats
2018-03-18 23:00:45 +01:00
943d641054
🔨 some refactoring
2018-03-18 16:07:21 +01:00
22929fe189
🚧 started a SAX/DOM/callback parser
2018-03-18 15:13:53 +01:00
375b05a17d
🔨 cleanup
2018-03-17 23:31:18 +01:00
606a25195f
✅ improved test coverage
2018-03-17 19:15:59 +01:00
c87ffad45c
♻️ implemented a non-recursive parser
2018-03-17 14:46:50 +01:00
2a5506ed98
Amalgamated headers
2018-03-16 13:16:10 -04:00
27cf05af8d
Merge branch 'develop' into feature/sax2
2018-03-14 22:02:19 +01:00
afef474c0d
🔖 set version to 3.1.2
2018-03-14 21:09:27 +01:00
282bafae4f
🔨 fixed compilation error
2018-03-14 07:18:42 +01:00
abac6a0e84
Merge branch 'develop' into feature/sax2
2018-03-13 23:58:17 +01:00
8557151d90
♻️ adjusting lexer/parser in symmetry to #1006
2018-03-12 19:15:11 +01:00
