j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1643 from kevinlul/develop

Browse source 
Fix json.hpp compilation issue with other typedefs with same name (Issue #1642)
This commit is contained in:
Niels Lohmann 2019-07-01 22:57:04 +02:00 • committed by GitHub
commit 9289a23a76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/src/unit-regression.cpp
View file

@ -1799,3 +1799,13 @@ TEST_CASE("regression tests, exceptions dependent")
}
}
#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 {};