amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-07 06:57:14 +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 authored and GitHub committed 2019-07-01 22:57:04 +02:00
2 parents 9a775bcb14 e616d095ab
commit 9289a23a76
3 files changed
+22 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/src/unit-regression.cpp
+10
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 {};