Niels Lohmann
16c5bfeaad
👌 fixed compiler warnings #1031
2018-04-02 13:01:56 +02:00
Niels Lohmann
727dd4664b
🔨 trying to make tests run with MSVC #1031
2018-04-02 12:27:07 +02:00
Niels Lohmann
ab89ae4e50
🔨 trying to make tests run with MSVC #1031
2018-04-02 11:34:36 +02:00
Niels Lohmann
eb06d0531a
🚧 added input adapter for wide strings #1031
2018-04-01 19:12:36 +02:00
Niels Lohmann
4efa8cdb4c
💚 fixed Valgrind options #1030
2018-03-29 17:19:21 +02:00
Niels Lohmann
830c93fd09
📝 fixed example for operator> #1029
2018-03-29 17:07:55 +02:00
Niels Lohmann
d2dd27dc3b
Merge branch 'release/3.1.2' into develop
2018-03-14 21:48:03 +01:00
Niels Lohmann
8a6c8cb0f7
🔖 set version to 3.1.2
2018-03-14 21:32:03 +01:00
Niels Lohmann
afef474c0d
🔖 set version to 3.1.2
2018-03-14 21:09:27 +01:00
Niels Lohmann
919d1fef8f
Merge pull request #1009 from nlohmann/user_string_parser
...
Allowing for user-defined string type in lexer/parser
2018-03-13 14:52:59 +01:00
Niels Lohmann
8557151d90
♻️ adjusting lexer/parser in symmetry to #1006
2018-03-12 19:15:11 +01:00
Niels Lohmann
b56ac86471
📝 thanks for #1006
2018-03-12 18:44:19 +01:00
Niels Lohmann
0cab3b2c8e
Merge pull request #1006 from agrianius/dump-template
...
dump to alternative string type, as defined in basic_json template
2018-03-12 18:41:59 +01:00
Vitaliy Manushkin
392c033805
test refactoring
2018-03-11 00:29:04 +03:00
Vitaliy Manushkin
51349537fc
add unit test: checking dump to alternative string type
2018-03-10 23:59:10 +03:00
Vitaliy Manushkin
830f3e5290
forward alternative string class from output_adapter to output_string_adapter
2018-03-10 23:58:16 +03:00
Vitaliy Manushkin
ed6b1464f9
dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code)
2018-03-10 17:36:51 +03:00
Vitaliy Manushkin
faccc37d0d
dump to alternate implementation of string, as defined in basic_json template
2018-03-10 17:19:28 +03:00
Niels Lohmann
6151dfaed7
👌 made changes proposed in #1001
2018-03-10 11:02:58 +01:00
Niels Lohmann
9918523077
📝 cleanup after #1001
2018-03-09 21:31:46 +01:00
Niels Lohmann
e737de8941
Merge pull request #1001 from nlohmann/leak
...
Fix memory leak during parser callback
2018-03-09 21:23:00 +01:00
Niels Lohmann
aa8fc2a41c
🚑 hopefully fixed the memory leak
2018-03-08 17:11:15 +01:00
Niels Lohmann
cf60e18c89
🔥 removing failing test (work on this in branch "leak")
2018-03-08 07:39:21 +01:00
Niels Lohmann
97559bb1b2
🔨 trying to fix the leak
...
Part 1: properly use forwarding
2018-03-08 07:36:56 +01:00
Niels Lohmann
38345fd06c
👌 fixed some more warnings
2018-03-07 22:51:22 +01:00
Niels Lohmann
d183d34b96
💚 added another test case
2018-03-07 22:25:25 +01:00
Niels Lohmann
d2d65bb25b
♻️ refined SFINAE to fix some warnings
2018-03-07 22:01:44 +01:00
Niels Lohmann
476b2e09be
💚 added regression tests for #972 and #977
2018-03-06 20:13:31 +01:00
Niels Lohmann
62030615a0
Merge pull request #986 from theodelrieu/fix/basic_json_conversion
...
Fix/basic json conversion
2018-03-06 19:27:39 +01:00
Niels Lohmann
fdecbf6e1e
Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition
...
fixed misprinted condition detected by PVS Studio.
2018-03-05 15:57:57 +01:00
Mike Bogdanov
fd30ad8a14
did make amalgamate
2018-03-02 11:47:35 +03:00
Mike Bogdanov
2a2ed799b1
pvs_studio fix. misprinted condition
2018-03-02 11:12:44 +03:00
Niels Lohmann
8d104e6fe3
💚 fixed test case
2018-02-28 22:40:48 +01:00
Niels Lohmann
5773e164bb
🚨 fixed a linter warning
2018-02-28 19:59:54 +01:00
Théo DELRIEU
8711ec6034
support construction from other basic_json types
...
Before this patch, `basic_json` types with different template arguments
were treated as `CompatibleArrayType`. Which sometimes leads to recursive
calls and stack overflows.
This patch adds a constructor and a `get` overload to deal with
different `basic_json` types.
2018-02-27 16:48:09 +01:00
Théo DELRIEU
c22f2d41f3
missing CHECK_NOTHROW in unit-udt
2018-02-27 11:09:53 +01:00
Niels Lohmann
1f3d2a3be7
📝 overworked README
2018-02-26 17:37:24 +01:00
Niels Lohmann
13ca723c38
Merge pull request #981 from wla80/develop
...
Make integration section concise
2018-02-26 16:51:51 +01:00
Wilson
05d3bf1699
Make integration section concise
2018-02-25 22:12:44 -08:00
Niels Lohmann
8968adcd53
Merge branch 'release/3.1.1' into develop
2018-02-13 19:36:35 +01:00
Niels Lohmann
8424d10e45
🔖 set version to 3.1.1
2018-02-13 15:59:32 +01:00
Niels Lohmann
938c861a09
🔖 set version to 3.1.1
2018-02-12 22:59:36 +01:00
Niels Lohmann
94b7a8da66
💄 fixed indentation
2018-02-12 20:46:14 +01:00
Niels Lohmann
20b5f4d89c
Merge pull request #969 from theodelrieu/fix/924
...
Fix constraints on from_json(CompatibleArrayType)
2018-02-12 18:17:59 +01:00
Théo DELRIEU
01d6118828
Fix constraints on from_json(CompatibleArrayType)
...
Fixes #924
2018-02-12 15:37:33 +01:00
Niels Lohmann
b02e3bb0b6
Merge pull request #957 from theodelrieu/fix_coveralls
...
Make coveralls watch the include folder
2018-02-12 15:02:21 +01:00
Théo DELRIEU
41db7cd818
Make the coveralls job use the multiple header version
2018-02-12 10:23:33 +01:00
Niels Lohmann
447f5421eb
🔨 overworked release target
2018-02-11 16:50:01 +01:00
Niels Lohmann
61f0bfb15c
🔨 enforce using Python 2 for the wandbox script
2018-02-11 14:46:15 +01:00
Niels Lohmann
548f488941
🔨 overworked Makefile
2018-02-10 14:46:39 +01:00
