Merge pull request #2367 from nlohmann/hedley14

Update Hedley

Merge pull request #2367 from nlohmann/hedley14
6030a110 · Niels Lohmann · GitHub · b9d76516 · 14f8be11 · 6030a110
Unverified Commit 6030a110 authored Aug 26, 2020 by Niels Lohmann Committed by GitHub Aug 26, 2020
Showing with 2 additions and 0 deletions

hedley.hpp include/nlohmann/thirdparty/hedley/hedley.hpp +0 -0

hedley_undef.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp +2 -0

json.hpp single_include/nlohmann/json.hpp +0 -0

No files found.
--- a/include/nlohmann/thirdparty/hedley/hedley.hpp
+++ b/include/nlohmann/thirdparty/hedley/hedley.hpp
--- a/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
+++ b/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
@@ -74,6 +74,8 @@
 #undef JSON_HEDLEY_IBM_VERSION_CHECK
 #undef JSON_HEDLEY_IMPORT
 #undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_CL_VERSION
+#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
 #undef JSON_HEDLEY_INTEL_VERSION
 #undef JSON_HEDLEY_INTEL_VERSION_CHECK
 #undef JSON_HEDLEY_IS_CONSTANT

--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp