043eff5ba8
👷 added more CI workers
2018-07-31 21:18:33 +02:00
05b27e83b7
Exclude bytewise comparison in certain tests.
...
These tests never worked - they weren't run before
d5aaeb4
2018-07-29 14:52:52 +02:00
d5aaeb4cce
Make section names unique in loops, as catch doesn't support duplicate
...
sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122
As a result, when built with gcc, loop iterations were skipped. When
built with clang, the test aborted with an assertion in catch.hpp
line 6222.
This also addresses the issues discussed here:
https://github.com/nlohmann/json/issues/1032#issuecomment-378707696
and here:
https://github.com/catchorg/Catch2/issues/1241
Please note that this introduces new problems, as some of
the unit tests fail now - the library stores keys in
lexographical order, while the cbor/msgpack/ubjson examples
store them in original order.
2018-07-29 10:44:36 +02:00
3760a38b7e
🏁 implicit conversion is not allowed with MSVC
2018-07-21 11:47:05 +02:00
5b14411669
🏁 trying to fix C2440 error
...
Error in AppVeyor:
unit-conversions.cpp(441): error C2440: 'initializing': cannot convert from 'nlohmann::json' to 'std::nullptr_t'
(https://ci.appveyor.com/project/nlohmann/json/build/2838/job/wo7im01sq6tvhe9m )
2018-07-21 10:59:00 +02:00
347e77bdc1
🚑 fix for #1169
2018-07-21 10:31:55 +02:00
04372a8c56
🏁 fix for #1168
2018-07-19 17:31:50 +02:00
d0e60de433
Add new JSON_INTERNAL_CATCH macro function
2018-07-19 15:43:41 +09:00
7bfc406ded
📝 added note about CocoaPods #1148
2018-07-05 21:18:46 +02:00
d456a2d777
Merge pull request #1151 from sonulohani/bigObjFix
...
Fixed compiler error in VS 2015 for debug mode
2018-06-29 09:03:43 +02:00
b8ad3388ec
Fixed compiler error in VS 2015 for debug mode
...
https://github.com/nlohmann/json/issues/1114
2018-06-29 09:34:41 +05:30
39dd775e38
🔨 cleanup after #1134
2018-06-28 21:32:32 +02:00
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
