summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-02-01 17:00:19 +0000
committerSadie Powell <sadie@witchery.services>2021-02-01 17:00:19 +0000
commit5b21a60a9d96827d6822c56b2dfdf08dbce5867f (patch)
tree1290d473d5f4e2088f432331fbdacaea7a6d6355
parenta235e4356074f10b6946ee4019769a707f4f6e1d (diff)
Fix using the TR1 headers on compilers that support C++17.
-rw-r--r--include/compat.h2
-rw-r--r--make/test/compiler.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/compat.h b/include/compat.h
index 47fda1e23..886805243 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -24,7 +24,7 @@
* Some implementations of the C++11 standard library are incomplete so we use
* the implementation of the same types from C++ Technical Report 1 instead.
*/
-#if defined _LIBCPP_VERSION || defined _WIN32
+#if defined _LIBCPP_VERSION || defined _WIN32 || __cplusplus >= 201103L
# define TR1NS std
# include <array>
# include <functional>
diff --git a/make/test/compiler.cpp b/make/test/compiler.cpp
index 5adf83df8..524874ed6 100644
--- a/make/test/compiler.cpp
+++ b/make/test/compiler.cpp
@@ -19,7 +19,7 @@
#include <iostream>
-#if defined _LIBCPP_VERSION
+#if defined _LIBCPP_VERSION || __cplusplus >= 201103L
# include <array>
# include <type_traits>
# include <unordered_map>