GitHub-Proxy/googletest
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/google/googletest.git synced 2025-06-04 11:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix GCC15 warning that <ciso646> is deprecated in C++17

Browse Source 
PiperOrigin-RevId: 752706554
Change-Id: I83d35b693efdaabcc63d15169dbf19d63163a563
This commit is contained in:
Derek Mauro 2025-04-29 06:12:50 -07:00 committed by Copybara-Service
parent cd430b47a5
commit 00b2154e8e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
googletest/include/gtest/internal/gtest-port.h
View File

@ -282,10 +282,14 @@
// Detect C++ feature test macros as gracefully as possible. // Detect C++ feature test macros as gracefully as possible.
// MSVC >= 19.15, Clang >= 3.4.1, and GCC >= 4.1.2 support feature test macros. // MSVC >= 19.15, Clang >= 3.4.1, and GCC >= 4.1.2 support feature test macros.
#if GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && \ //
(!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<version>)) // GCC15 warns that <ciso646> is deprecated in C++17 and suggests using
#include <version> // C++20 and later // <version> instead, even though <version> is not available in C++17 mode prior
#elif (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<ciso646>)) // to GCC9.
#if GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L || \
GTEST_INTERNAL_HAS_INCLUDE(<version>)
#include <version> // C++20 or <version> support.
#else
#include <ciso646> // Pre-C++20 #include <ciso646> // Pre-C++20
#endif #endif