From: Sadie Powell <sadie@witchery.services>
Date: Mon, 1 Feb 2021 17:00:19 +0000 (+0000)
Subject: Fix using the TR1 headers on compilers that support C++17.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=5b21a60a9d96827d6822c56b2dfdf08dbce5867f;p=user%2Fhenk%2Fcode%2Finspircd.git

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

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>