Implement the infrastructure for feature-test macros. Very few actual feature test macros, though. Reviewed as: https://reviews.llvm.org/D51955
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@342073 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/algorithm b/include/algorithm
index 55e1f9f..1359fda 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -646,6 +646,7 @@
#include <iterator>
#include <cstddef>
#include <bit>
+#include <version>
#include <__debug>
diff --git a/include/any b/include/any
index e6e0b6e..e2945bd 100644
--- a/include/any
+++ b/include/any
@@ -87,6 +87,7 @@
#include <typeinfo>
#include <type_traits>
#include <cstdlib>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/array b/include/array
index ba4ff42..8f4e111 100644
--- a/include/array
+++ b/include/array
@@ -112,6 +112,7 @@
#include <algorithm>
#include <stdexcept>
#include <cstdlib> // for _LIBCPP_UNREACHABLE
+#include <version>
#include <__debug>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/include/atomic b/include/atomic
index 809f78a..d37e7b4 100644
--- a/include/atomic
+++ b/include/atomic
@@ -544,6 +544,7 @@
#include <cstddef>
#include <cstdint>
#include <type_traits>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
@@ -559,10 +560,6 @@
#error C++ standard library is incompatible with <stdatomic.h>
#endif
-#if _LIBCPP_STD_VER > 14
-# define __cpp_lib_atomic_is_always_lock_free 201603L
-#endif
-
#define _LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) \
_LIBCPP_DIAGNOSE_WARNING(__m == memory_order_consume || \
__m == memory_order_acquire || \
diff --git a/include/bit b/include/bit
index 5bf5214..db3812e 100644
--- a/include/bit
+++ b/include/bit
@@ -21,6 +21,7 @@
*/
#include <__config>
+#include <version>
#if defined(__IBMCPP__)
#include "support/ibm/support.h"
diff --git a/include/chrono b/include/chrono
index b9709b3..0691101 100644
--- a/include/chrono
+++ b/include/chrono
@@ -798,6 +798,7 @@
#include <type_traits>
#include <ratio>
#include <limits>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/cmath b/include/cmath
index ffb1c46..f5f62ad 100644
--- a/include/cmath
+++ b/include/cmath
@@ -303,6 +303,7 @@
#include <__config>
#include <math.h>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/complex b/include/complex
index d692ee3..8cf6a94 100644
--- a/include/complex
+++ b/include/complex
@@ -245,6 +245,7 @@
#include <stdexcept>
#include <cmath>
#include <sstream>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/cstddef b/include/cstddef
index b45dbe2..b4c42b1 100644
--- a/include/cstddef
+++ b/include/cstddef
@@ -35,6 +35,7 @@
*/
#include <__config>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/deque b/include/deque
index bfbd3a5..414c7a8 100644
--- a/include/deque
+++ b/include/deque
@@ -161,6 +161,7 @@
#include <iterator>
#include <algorithm>
#include <stdexcept>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/exception b/include/exception
index b517486..7fd9279 100644
--- a/include/exception
+++ b/include/exception
@@ -81,6 +81,7 @@
#include <cstddef>
#include <cstdlib>
#include <type_traits>
+#include <version>
#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)
#include <vcruntime_exception.h>
diff --git a/include/filesystem b/include/filesystem
index aa1d718..7547e6c 100644
--- a/include/filesystem
+++ b/include/filesystem
@@ -244,6 +244,7 @@
#include <utility>
#include <iomanip> // for quoted
#include <string_view>
+#include <version>
#include <__debug>
@@ -256,10 +257,6 @@
#ifndef _LIBCPP_CXX03_LANG
-#if _LIBCPP_STD_VER >= 17
-#define __cpp_lib_filesystem 201703
-#endif
-
_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
struct _FilesystemClock {
diff --git a/include/forward_list b/include/forward_list
index 571afdc..f9a71f0 100644
--- a/include/forward_list
+++ b/include/forward_list
@@ -177,6 +177,7 @@
#include <limits>
#include <iterator>
#include <algorithm>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/functional b/include/functional
index b91fd75..41beb40 100644
--- a/include/functional
+++ b/include/functional
@@ -487,6 +487,7 @@
#include <memory>
#include <tuple>
#include <utility>
+#include <version>
#include <__functional_base>
@@ -2340,8 +2341,6 @@
#if _LIBCPP_STD_VER > 14
-#define __cpp_lib_invoke 201411
-
template <class _Fn, class ..._Args>
result_of_t<_Fn&&(_Args&&...)>
invoke(_Fn&& __f, _Args&&... __args)
diff --git a/include/iomanip b/include/iomanip
index a6bee73..36c1116 100644
--- a/include/iomanip
+++ b/include/iomanip
@@ -46,6 +46,7 @@
#include <__config>
#include <__string>
#include <istream>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/iterator b/include/iterator
index 9415e0b..aed0525 100644
--- a/include/iterator
+++ b/include/iterator
@@ -418,6 +418,7 @@
#include <type_traits>
#include <cstddef>
#include <initializer_list>
+#include <version>
#ifdef __APPLE__
#include <Availability.h>
#endif
diff --git a/include/list b/include/list
index 49e2e1e..8f0e1db 100644
--- a/include/list
+++ b/include/list
@@ -181,6 +181,7 @@
#include <iterator>
#include <algorithm>
#include <type_traits>
+#include <version>
#include <__debug>
diff --git a/include/map b/include/map
index 4700a09..cfd8280 100644
--- a/include/map
+++ b/include/map
@@ -460,6 +460,7 @@
#include <functional>
#include <initializer_list>
#include <type_traits>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/memory b/include/memory
index de3f52d..276b3b7 100644
--- a/include/memory
+++ b/include/memory
@@ -667,6 +667,7 @@
#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
# include <atomic>
#endif
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/mutex b/include/mutex
index 52e39b0..9c55c7c 100644
--- a/include/mutex
+++ b/include/mutex
@@ -194,6 +194,7 @@
#ifndef _LIBCPP_CXX03_LANG
#include <tuple>
#endif
+#include <version>
#include <__threading_support>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/include/new b/include/new
index d27ff29..8d72ba5 100644
--- a/include/new
+++ b/include/new
@@ -91,6 +91,7 @@
#include <exception>
#include <type_traits>
#include <cstddef>
+#include <version>
#ifdef _LIBCPP_NO_EXCEPTIONS
#include <cstdlib>
#endif
diff --git a/include/numeric b/include/numeric
index 70ef173..4e68239 100644
--- a/include/numeric
+++ b/include/numeric
@@ -142,6 +142,7 @@
#include <iterator>
#include <limits> // for numeric_limits
#include <functional>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/optional b/include/optional
index a76f8d1..9ef0aac 100644
--- a/include/optional
+++ b/include/optional
@@ -156,6 +156,7 @@
#include <stdexcept>
#include <type_traits>
#include <utility>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/regex b/include/regex
index dcdb14a..db15f78 100644
--- a/include/regex
+++ b/include/regex
@@ -769,6 +769,7 @@
#include <memory>
#include <vector>
#include <deque>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/scoped_allocator b/include/scoped_allocator
index 4760d94..bdbb013 100644
--- a/include/scoped_allocator
+++ b/include/scoped_allocator
@@ -108,6 +108,7 @@
#include <__config>
#include <memory>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/set b/include/set
index 108a9e9..f2ce6ea 100644
--- a/include/set
+++ b/include/set
@@ -402,6 +402,7 @@
#include <__tree>
#include <__node_handle>
#include <functional>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/shared_mutex b/include/shared_mutex
index a7735d6..fbde0cf 100644
--- a/include/shared_mutex
+++ b/include/shared_mutex
@@ -124,6 +124,7 @@
*/
#include <__config>
+#include <version>
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
diff --git a/include/string b/include/string
index 162e540..c79164c 100644
--- a/include/string
+++ b/include/string
@@ -510,6 +510,7 @@
#include <type_traits>
#include <initializer_list>
#include <__functional_base>
+#include <version>
#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
#include <cstdint>
#endif
diff --git a/include/string_view b/include/string_view
index 6377aeb..55dce72 100644
--- a/include/string_view
+++ b/include/string_view
@@ -178,6 +178,7 @@
#include <iterator>
#include <limits>
#include <stdexcept>
+#include <version>
#include <__debug>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/include/tuple b/include/tuple
index b3a17e7..fb5428e 100644
--- a/include/tuple
+++ b/include/tuple
@@ -141,6 +141,7 @@
#include <type_traits>
#include <__functional_base>
#include <utility>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/type_traits b/include/type_traits
index e413d26..7ff67bf 100644
--- a/include/type_traits
+++ b/include/type_traits
@@ -404,6 +404,7 @@
*/
#include <__config>
#include <cstddef>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
@@ -4758,7 +4759,6 @@
#if _LIBCPP_STD_VER > 14
-#define __cpp_lib_void_t 201411
template <class...> using void_t = void;
# ifndef _LIBCPP_HAS_NO_VARIADICS
diff --git a/include/unordered_map b/include/unordered_map
index 348f579..fc3cfb6 100644
--- a/include/unordered_map
+++ b/include/unordered_map
@@ -386,6 +386,7 @@
#include <functional>
#include <stdexcept>
#include <tuple>
+#include <version>
#include <__debug>
diff --git a/include/unordered_set b/include/unordered_set
index 9b8560d..a219fa6 100644
--- a/include/unordered_set
+++ b/include/unordered_set
@@ -338,6 +338,7 @@
#include <__hash_table>
#include <__node_handle>
#include <functional>
+#include <version>
#include <__debug>
diff --git a/include/utility b/include/utility
index ed9bf03..570ec05 100644
--- a/include/utility
+++ b/include/utility
@@ -203,6 +203,7 @@
#include <cstddef>
#include <cstring>
#include <cstdint>
+#include <version>
#include <__debug>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/include/variant b/include/variant
index 6c7dca2..6a52356 100644
--- a/include/variant
+++ b/include/variant
@@ -208,6 +208,7 @@
#include <type_traits>
#include <utility>
#include <limits>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/vector b/include/vector
index 9245ba1..e7aaa4d 100644
--- a/include/vector
+++ b/include/vector
@@ -276,6 +276,7 @@
#include <stdexcept>
#include <algorithm>
#include <cstring>
+#include <version>
#include <__split_buffer>
#include <__functional_base>
diff --git a/include/version b/include/version
index 6d10411..80c2797 100644
--- a/include/version
+++ b/include/version
@@ -101,4 +101,17 @@
#pragma GCC system_header
#endif
+#if _LIBCPP_STD_VER > 11
+#endif
+
+#if _LIBCPP_STD_VER > 14
+# define __cpp_lib_atomic_is_always_lock_free 201603L
+# define __cpp_lib_filesystem 201703L
+# define __cpp_lib_invoke 201411L
+# define __cpp_lib_void_t 201411L
+#endif
+
+#if _LIBCPP_STD_VER > 17
+#endif
+
#endif // _LIBCPP_VERSIONH