Changeset 275616 in webkit
- Timestamp:
- Apr 7, 2021 11:23:36 AM (3 years ago)
- Location:
- trunk/Source/ThirdParty
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/ThirdParty/ChangeLog
r275602 r275616 1 2021-04-07 Don Olmstead <don.olmstead@sony.com> 2 3 [PlayStation] Do not include <any> in gtest because it requires RTTI 4 https://bugs.webkit.org/show_bug.cgi?id=224281 5 6 Reviewed by Ross Kirsling. 7 8 To determine platform capabilities gtest looks to see if a platform is using a minimum 9 C++ version and whether it has a required header. In the PlayStation's case it sees that 10 the <any> header is present with the requisite version of C++ so it defines support for it 11 and includes the header. However in the PlayStation's case to use <any> RTTI must be 12 enabled and if it isn't an error is generated. 13 14 This patch adds a way to short circuit GTEST_INTERNAL values for ports. An upstream fix is 15 in review at https://github.com/google/googletest/pull/3345 and if landed then the next 16 update to gtest can remove this patch. 17 18 * gtest/PlatformPlayStation.cmake: 19 * gtest/README.WebKit: Added. 20 * gtest/include/gtest/internal/gtest-port.h: 21 1 22 2021-04-07 Don Olmstead <don.olmstead@sony.com> 2 23 -
trunk/Source/ThirdParty/gtest/PlatformPlayStation.cmake
r275602 r275616 4 4 GTEST_HAS_POSIX_RE=0 5 5 GTEST_HAS_TR1_TUPLE=0 6 GTEST_INTERNAL_HAS_ANY=0 6 7 ) 7 8 -
trunk/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
r274887 r275616 2278 2278 } // namespace testing 2279 2279 #else 2280 #if !defined(GTEST_INTERNAL_HAS_ANY) 2280 2281 #ifdef __has_include 2281 2282 #if __has_include(<any>) && __cplusplus >= 201703L … … 2283 2284 // specializations. 2284 2285 #define GTEST_INTERNAL_HAS_ANY 1 2286 #endif // __has_include(<any>) && __cplusplus >= 201703L 2287 #endif // __has_include 2288 #endif // !defined(GTEST_INTERNAL_HAS_ANY) 2289 #if GTEST_INTERNAL_HAS_ANY 2285 2290 #include <any> 2286 2291 namespace testing { … … 2291 2296 // The case where absl is configured NOT to alias std::any is not 2292 2297 // supported. 2293 #endif // __has_include(<any>) && __cplusplus >= 201703L 2294 #endif // __has_include 2298 #endif // GTEST_INTERNAL_HAS_ANY 2295 2299 #endif // GTEST_HAS_ABSL 2296 2300 … … 2307 2311 } // namespace testing 2308 2312 #else 2313 #if !defined(GTEST_INTERNAL_HAS_OPTIONAL) 2309 2314 #ifdef __has_include 2310 2315 #if __has_include(<optional>) && __cplusplus >= 201703L … … 2312 2317 // specializations. 2313 2318 #define GTEST_INTERNAL_HAS_OPTIONAL 1 2319 #endif // __has_include(<optional>) && __cplusplus >= 201703L 2320 #endif // __has_include 2321 #endif // !defined(GTEST_INTERNAL_HAS_OPTIONAL) 2322 #if GTEST_INTERNAL_HAS_OPTIONAL 2314 2323 #include <optional> 2315 2324 namespace testing { … … 2321 2330 // The case where absl is configured NOT to alias std::optional is not 2322 2331 // supported. 2323 #endif // __has_include(<optional>) && __cplusplus >= 201703L 2324 #endif // __has_include 2332 #endif // GTEST_INTERNAL_HAS_OPTIONAL 2325 2333 #endif // GTEST_HAS_ABSL 2326 2334 … … 2336 2344 } // namespace testing 2337 2345 #else 2338 # ifdef __has_include 2339 # if __has_include(<string_view>) && __cplusplus >= 201703L 2346 #if !defined(GTEST_INTERNAL_HAS_STRING_VIEW) 2347 #ifdef __has_include 2348 #if __has_include(<string_view>) && __cplusplus >= 201703L 2340 2349 // Otherwise for C++17 and higher use std::string_view for Matcher<> 2341 2350 // specializations. 2342 # define GTEST_INTERNAL_HAS_STRING_VIEW 1 2351 #define GTEST_INTERNAL_HAS_STRING_VIEW 1 2352 #endif // __has_include(<string_view>) && __cplusplus >= 201703L 2353 #endif // __has_include 2354 #endif // !defined(GTEST_INTERNAL_HAS_STRING_VIEW) 2355 #if GTEST_INTERNAL_HAS_STRING_VIEW 2343 2356 #include <string_view> 2344 2357 namespace testing { … … 2349 2362 // The case where absl is configured NOT to alias std::string_view is not 2350 2363 // supported. 2351 # endif // __has_include(<string_view>) && __cplusplus >= 201703L 2352 # endif // __has_include 2364 #endif // GTEST_INTERNAL_HAS_STRING_VIEW 2353 2365 #endif // GTEST_HAS_ABSL 2354 2366 … … 2365 2377 } // namespace testing 2366 2378 #else 2379 #if !defined(GTEST_INTERNAL_HAS_VARIANT) 2367 2380 #ifdef __has_include 2368 2381 #if __has_include(<variant>) && __cplusplus >= 201703L … … 2370 2383 // specializations. 2371 2384 #define GTEST_INTERNAL_HAS_VARIANT 1 2385 #endif // __has_include(<variant>) && __cplusplus >= 201703L 2386 #endif // __has_include 2387 #endif // !defined(GTEST_INTERNAL_HAS_VARIANT) 2388 #if GTEST_INTERNAL_HAS_VARIANT 2372 2389 #include <variant> 2373 2390 namespace testing { … … 2378 2395 } // namespace testing 2379 2396 // The case where absl is configured NOT to alias std::variant is not supported. 2380 #endif // __has_include(<variant>) && __cplusplus >= 201703L 2381 #endif // __has_include 2397 #endif // GTEST_INTERNAL_HAS_VARIANT 2382 2398 #endif // GTEST_HAS_ABSL 2383 2399
Note: See TracChangeset
for help on using the changeset viewer.