Merge pull request #70321 from allevato/c++20-fixes

allevato · web-flow · commit 28e63694ea23 · 2023-12-08T14:04:35.000-05:00
[C++20] Two very minor C++20 fixes.
diff --git a/include/swift/Basic/Compiler.h b/include/swift/Basic/Compiler.h
@@ -200,7 +200,7 @@
 #if defined(__cplusplus)
 #if defined(__cpp_char8_t)
 inline constexpr char operator""_swift_u8(char8_t c) { return c; }
-inline const char *operator""_swift_u8(const char8_t *p, std::size_t) {
+inline const char *operator""_swift_u8(const char8_t *p, size_t) {
   return reinterpret_cast<const char *>(p);
 }
 #define SWIFT_UTF8(literal) u8##literal##_swift_u8
diff --git a/include/swift/RemoteInspection/MetadataSource.h b/include/swift/RemoteInspection/MetadataSource.h
@@ -29,6 +29,7 @@ using llvm::cast;
 
 #include <cerrno>
 #include <climits>
+#include <cstdlib>
 #include <string>
 
 namespace swift {

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@`
`200`	`200`	`#if defined(__cplusplus)`
`201`	`201`	`#if defined(__cpp_char8_t)`
`202`	`202`	`inline constexpr char operator""_swift_u8(char8_t c) { return c; }`
`203`		`-inline const char operator""_swift_u8(const char8_t p, std::size_t) {`
	`203`	`+inline const char operator""_swift_u8(const char8_t p, size_t) {`
`204`	`204`	`return reinterpret_cast<const char *>(p);`
`205`	`205`	`}`
`206`	`206`	`#define SWIFT_UTF8(literal) u8##literal##_swift_u8`