amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-03-03 15:56:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use DOCTEST_* compiler macros and suppress pragmas warning (#3550)

Browse Source 
Use DOCTEST_* macros in place of predefined compiler macros for compiler
detection and version checks.

The suppression of warning -Wrange-loop-construct in unit-items.cpp
causes GCC<11 to warn about pragmas. Suppressed by adding a version
check.
This commit is contained in:
Florian Albrechtskirchinger
2022-06-21 16:57:47 +02:00
committed by GitHub
parent 87cda1d664
commit 39e27684ea
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/unit-regression1.cpp
View File

@@ -1520,7 +1520,7 @@ TEST_CASE("regression tests, exceptions dependent")
/////////////////////////////////////////////////////////////////////
// the code below fails with Clang on Windows, so we need to exclude it there
#if defined(__clang__) && (defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__))
#if DOCTEST_CLANG && (defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__))
#else
template <typename T> class array {};
template <typename T> class object {};