Fix using the TR1 headers on compilers that support C++17.

diff --git a/include/compat.h b/include/compat.h
index 47fda1e23564682c45236377178b2684d29efde2..8868052431ab21658735418d6d0a4fe77a89cb53 100644 (file)
--- 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 5adf83df8e8186bbcba02ca4e368bff58bb898dc..524874ed6e2e86d4e49b9237ce94ea36cad55a73 100644 (file)
--- 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>