86a96b059d
Merge pull request #1134 from Daniel599/feature/items_iterator
...
fixed compile error for #1045
2018-06-28 21:21:17 +02:00
396a914f9e
🔨 added macro to disable compiler check #1128
2018-06-26 22:47:40 +02:00
bab5826504
Merge pull request #1144 from jrakow/cppreference-link-fix
...
Fix links to cppreference named requirements (formerly concepts)
2018-06-26 07:58:45 +02:00
515cfc2d89
Merge pull request #1142 from jrakow/develop
...
meson: fix include directory
2018-06-24 23:33:30 +02:00
963d06a13c
📝 fix links to cppreference named requirements
...
"Concepts" have been renamed to "named requirements".
This is because P0898R3 Standard Library Concepts has been merged into
C++20.
Cppreference have moved their links accordingly.
2018-06-24 22:36:19 +02:00
9f00db48d9
📝 link to cppreference via HTTPS
2018-06-24 22:34:47 +02:00
ec2ebd5ec9
meson: add multiple headers target
2018-06-24 18:07:30 +02:00
0bb36bb140
meson: fix include directory
2018-06-24 18:07:30 +02:00
62457729e8
📝 mentioned MinGW in README
2018-06-24 18:03:59 +02:00
09c0df4a21
👷 choosing correct image
2018-06-24 17:40:16 +02:00
1bbc4a0859
👷 using Ninja to speed up build
2018-06-24 17:10:13 +02:00
d8fe13fc83
🔨 fixed escaping for MinGW
2018-06-24 16:57:53 +02:00
e59b930927
👷 trying a more recent compiler
2018-06-24 16:40:47 +02:00
937d68e2e5
👷 forgot old PATH
2018-06-24 16:37:02 +02:00
989ad9b759
👷 using help from https://stackoverflow.com/a/48509334/266378
2018-06-24 16:35:16 +02:00
067e288289
👷 set build type
2018-06-24 16:29:03 +02:00
7bbc06b487
👷 forgot quotes
2018-06-24 16:18:44 +02:00
441e5d87e6
👷 experimenting with AppVeyor and MinGW
2018-06-24 16:17:06 +02:00
7fa4ddf93e
💄 fixed indentation
2018-06-23 17:27:40 +02:00
bf348ca8a4
Merge pull request #1028 from gracicot/develop
...
Added support for string_view in C++17
2018-06-23 17:10:04 +02:00
ed6a0686df
🔨 small refactoring to improve branch coverage
...
The branch coverage reported by lcov is weird. The code before and after has the same Godbolt assembler, but the code with the lambda has a better branch coverage.
2018-06-23 17:05:04 +02:00
c8bfdfd961
👷 tryping different platforms for AppVeyor
2018-06-23 11:12:32 +02:00
c02de445bf
🚨 fixed more compiler warnings
2018-06-23 11:00:42 +02:00
66dd1a846d
🚨 fixed more compiler warnings
2018-06-23 10:47:55 +02:00
850922269d
🚨 removed compiler warnings
2018-06-23 10:28:04 +02:00
0460b90977
📝 fix for #1052 #1139
2018-06-22 22:35:48 +02:00
85f35a1d59
📝 documentation fix
2018-06-22 22:34:42 +02:00
e7c1638d11
💄 cleanup
2018-06-18 22:03:46 +02:00
1c81e9f5ae
Merge pull request #1130 from agrianius/develop
...
test (non)equality for alt_string implementation
2018-06-18 22:01:53 +02:00
d505ed7b31
Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion
...
Feature/unordered map conversion
2018-06-18 21:59:46 +02:00
2c920a1032
run make amalgamate
2018-06-18 15:14:10 +02:00
2b37d7ed86
from_json: add overload for std::unordered_map
...
Fixes #1133
2018-06-18 15:14:10 +02:00
299469cfd5
from_json: add missing template arguments for std::map
2018-06-18 10:52:11 +02:00
1566ad4053
fixed compile error for #1045 ; to_json for iternation_proxy_internal was needed
2018-06-16 12:01:49 +03:00
f574d7e084
simplify templates for operators, add more checks
2018-06-14 15:07:06 +03:00
cd28d872e7
forward declarations to make new compilers happy
2018-06-11 20:50:39 +03:00
3d3055909c
define global operator< for const char* and alt_string
2018-06-11 19:09:57 +03:00
4feb8211ca
test (non)equality for alt_string implementation
2018-06-11 18:03:46 +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
5676a2a076
Aligned template declaration
2018-06-03 23:51:07 -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
e830bc502f
Merge pull request #1117 from TinyTinni/develop
...
remove stringstream dependency
2018-06-01 08:05:45 +02:00
ecadcdb593
added char cast
...
should fix the GCC unittest
2018-05-31 16:36:16 +02:00
48656a49f5
typo
2018-05-31 15:32:21 +02:00
64acb42aa7
remove stringstream dependency
2018-05-31 13:45:58 +02:00
8efbf8d7bb
📝 documentation to avoid future issues like #1108
2018-05-28 18:14:44 +02:00
e5a67fc3f8
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2018-05-28 17:57:46 +02:00