amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-02-22 11:26:25 +00:00
Code Issues Packages Projects 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
parent 9a775bcb14 e616d095ab
commit 9289a23a76
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 {};