XCode 15 build fixes for upstream. (#1366)

Summary: Upstream commits: 7715e8b 605df79 Drop on 8.0.32 rebase. Pull Request resolved: #1366 Differential Revision: D49529761 fbshipit-source-id: 06b11e0ef52f7feea990213830789370a050c168
facebook · Sep 26, 2023 · 77f7282 · 77f7282
1 parent b4d6d63
commit 77f7282
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 43 deletions.
diff --git a/extra/robin-hood-hashing/robin_hood.h b/extra/robin-hood-hashing/robin_hood.h
@@ -203,13 +203,7 @@ static Counts& counts() {
 #    define ROBIN_HOOD_PRIVATE_DEFINITION_HAS_NATIVE_WCHART() 1
 #endif
 
-// workaround missing "is_trivially_copyable" in g++ < 5.0
-// See https://stackoverflow.com/a/31798726/48181
-#if defined(__GNUC__) && __GNUC__ < 5
-#    define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) __has_trivial_copy(__VA_ARGS__)
-#else
 #    define ROBIN_HOOD_IS_TRIVIALLY_COPYABLE(...) std::is_trivially_copyable<__VA_ARGS__>::value
-#endif
 
 // helpers for C++ versions, see https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
 #define ROBIN_HOOD_PRIVATE_DEFINITION_CXX() __cplusplus

diff --git a/router/src/http/src/CMakeLists.txt b/router/src/http/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -162,7 +162,6 @@ TARGET_INCLUDE_DIRECTORIES(http_auth_realm PRIVATE
 
 ADD_HARNESS_PLUGIN(http_server
   SOURCES
-  content_type.cc
   http_auth.cc
   http_auth_method_basic.cc
   http_server_component.cc

diff --git a/router/src/http/src/content_type.cc b/router/src/http/src/content_type.cc
diff --git a/router/src/http/tests/CMakeLists.txt b/router/src/http/tests/CMakeLists.txt
@@ -79,7 +79,6 @@ SET_TARGET_PROPERTIES(routertest_http_auth_method PROPERTIES
 
 add_test_file(test_content_type.cc
   MODULE http
-  EXTRA_SOURCES ../src/content_type.cc
   )
 ## content_type.cc is from the http_server plugin and its symbols are marked a "dllimport"
 ## by default. As we use them directly, mark them as "static" instead.