External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct position of templates relative to header in regression test

Browse Source 
Thanks @edo9300
https://github.com/nlohmann/json/issues/1642#issuecomment-502617640
This commit is contained in:
kevinlul 2019-07-01 17:34:29 -04:00
parent e616d095ab
commit 57e9152d91
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/src/unit-regression.cpp
View File

@ -33,6 +33,17 @@ DOCTEST_GCC_SUPPRESS_WARNING("-Wfloat-equal")
// for some reason including this after the json header leads to linker errors with VS 2017... // for some reason including this after the json header leads to linker errors with VS 2017...
#include <locale> #include <locale>
/////////////////////////////////////////////////////////////////////
// for #1642
// Must occur BEFORE header include!
/////////////////////////////////////////////////////////////////////
template <typename T> class array {};
template <typename T> class object {};
template <typename T> class string {};
template <typename T> class number_integer {};
template <typename T> class number_unsigned {};
template <typename T> class number_float {};
#define private public #define private public
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
using nlohmann::json; using nlohmann::json;
@ -1799,13 +1810,3 @@ TEST_CASE("regression tests, exceptions dependent")
} }
} }
#endif #endif
/////////////////////////////////////////////////////////////////////
// for #1642
/////////////////////////////////////////////////////////////////////
template <typename T> class array {};
template <typename T> class object {};
template <typename T> class string {};
template <typename T> class number_integer {};
template <typename T> class number_unsigned {};
template <typename T> class number_float {};