Skip to content

Commit 067e7ed

Browse files
committed
Correct includes in cpp2util.h for MacOSX12.3 SDK
On MacOSX 12.3 SDK there is no <memory_resource> header there is <experimental/memory_resource> - check with __has_include to include existing one. There was no <cuchar> and <stop_token> - add checking if it is present.
1 parent 8d5c9b7 commit 067e7ed

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

include/cpp2util.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@
8888
#include <utility>
8989
#include <variant>
9090
#include <memory>
91-
#ifdef __cpp_lib_memory_resource
91+
#if __has_include(<memory_resource>)
9292
#include <memory_resource>
93+
#elif __has_include(<experimental/memory_resource>)
94+
#include <experimental/memory_resource>
9395
#endif
9496
#include <new>
9597
#include <scoped_allocator>
@@ -106,7 +108,9 @@
106108
#include <cctype>
107109
#include <charconv>
108110
#include <cstring>
109-
#include <cuchar>
111+
#if __has_include(<cuchar>)
112+
#include <cuchar>
113+
#endif
110114
#include <cwchar>
111115
#include <cwctype>
112116
#ifdef __cpp_lib_format
@@ -174,7 +178,9 @@
174178
#include <semaphore>
175179
#endif
176180
#include <shared_mutex>
177-
#include <stop_token>
181+
#if __has_include(<stop_token>)
182+
#include <stop_token>
183+
#endif
178184
#include <thread>
179185
#include <iso646.h>
180186
#endif

0 commit comments

Comments
 (0)