Commit a39ad67

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 49495eacfdbda3f4b6ba219923fedbb2e3f99376
PR-URL: #65317 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 24a76e1 commit a39ad67

3 files changed

Lines changed: 90 additions & 21 deletions

File tree

β€Ždeps/googletest/include/gtest/gtest-printers.hβ€Ž

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,12 @@ class [[nodiscard]] UniversalTersePrinter<const wchar_t*> {
11731173
}
11741174
}
11751175
};
1176-
#endif
11771176

11781177
template <>
1179-
class[[nodiscard]] UniversalTersePrinter<wchar_t*> {
1180-
public:
1181-
staticvoidPrint(wchar_t* str, ::std::ostream* os) {
1182-
UniversalTersePrinter<constwchar_t*>::Print(str, os);
1183-
}
1184-
};
1178+
class[[nodiscard]] UniversalTersePrinter<wchar_t*>
1179+
: public UniversalTersePrinter<constwchar_t*> {};
1180+
1181+
#endif// GTEST_HAS_STD_WSTRING
11851182

11861183
template <typename T>
11871184
voidUniversalTersePrint(const T& value, ::std::ostream* os) {

β€Ždeps/googletest/include/gtest/internal/gtest-port.hβ€Ž

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,71 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
500500
#endif// defined(_MSC_VER) || defined(__BORLANDC__)
501501
#endif// GTEST_HAS_EXCEPTIONS
502502

503-
#ifndef GTEST_HAS_STD_WSTRING
504-
// The user didn't tell us whether ::std::wstring is available, so we need
505-
// to figure it out.
503+
// 1. Calculate default GTEST_HAS_STD_WSTRING values based on STL capabilities.
504+
#if defined(_MSVC_STL_VERSION)
505+
// Microsoft's STL implementation always supports ::std::wstring.
506+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
507+
508+
#elif defined(_LIBCPP_VERSION)
509+
// Modern libc++ always defines _LIBCPP_HAS_WIDE_CHARACTERS; its value
510+
// determines whether wide characters are supported.
511+
// Older libc++ omits a definition for _LIBCPP_HAS_NO_WIDE_CHARACTERS when wide
512+
// characters are supported.
513+
#if (defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
514+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
515+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
516+
#else
517+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
518+
#endif
519+
520+
#elif defined(__GLIBCXX__)
521+
#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T
522+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
523+
#else
524+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
525+
#endif
526+
527+
#else
528+
// Unknown standard library implementation; fall back looking at the OS.
529+
//
530+
// Always let the user override the defaults in this case; they might have more
531+
// information about what's supported than we do.
532+
#if defined(GTEST_OS_LINUX_ANDROID)
533+
// Android started supporting std::wstring with API Level 21 (Lollipop).
534+
#defineGTEST_HAS_STD_WSTRING_DEFAULT (__ANDROID_API__ >= 21)
535+
// The following platforms are known not to support ::std::wstring; assume it's
536+
// supported on all others.
537+
//
506538
// Cygwin 1.7 and below doesn't support ::std::wstring.
507-
// Solaris' libc++ doesn't support it either. Android has
508-
// no support for it at least as recent as Froyo (2.2).
509-
#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
510-
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
511-
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
512-
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
513-
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
514-
#defineGTEST_HAS_STD_WSTRING1
539+
// Solaris' libc++ doesn't support it either.
540+
#elif defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || \
541+
defined(GTEST_OS_HAIKU) || defined(GTEST_OS_ESP32) || \
542+
defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
543+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
544+
defined(GTEST_OS_NRF52)
545+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
515546
#else
516-
#defineGTEST_HAS_STD_WSTRING0
547+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
548+
#endif
549+
#endif
550+
551+
// 2. Validate explicit user overrides (if user passed -DGTEST_HAS_*=1) against
552+
// what the standard library implementation tells us it supports.
553+
#if defined(GTEST_HAS_STD_WSTRING) && GTEST_HAS_STD_WSTRING
554+
#if defined(_LIBCPP_VERSION) && \
555+
((defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
556+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS))
557+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libc++ wide character support.
558+
#elif defined(__GLIBCXX__) && \
559+
!(defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
560+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libstdc++ wide character support.
561+
#endif
562+
#endif
563+
564+
// 3. Set final values if not explicitly overridden by user
565+
#if !defined(GTEST_HAS_STD_WSTRING)
566+
#defineGTEST_HAS_STD_WSTRINGGTEST_HAS_STD_WSTRING_DEFAULT
517567
#endif
518-
#endif// GTEST_HAS_STD_WSTRING
519568

520569
#ifndef GTEST_HAS_FILE_SYSTEM
521570
// Most platforms support a file system.

β€Ždeps/googletest/src/gtest-printers.ccβ€Ž

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include<iomanip>
5151
#include<ios>
5252
#include<ostream>// NOLINT
53+
#include<string>
5354
#include<string_view>
5455
#include<type_traits>
5556

@@ -422,14 +423,36 @@ void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
422423

423424
namespace {
424425

426+
template <typename Char>
427+
size_tGetLength(const Char* s) {
428+
return std::char_traits<Char>::length(s);
429+
}
430+
431+
#if !GTEST_HAS_STD_WSTRING
432+
433+
// If GTEST_HAS_STD_WSTRING is unset because the standard library has disabled
434+
// wide character support, std::char_traits<wchar_t> won't be defined, which
435+
// will cause a compile error, even if user code never actually could print a
436+
// wide cstring. In that case, instead use `wcslen` directly.
437+
//
438+
// If `libc` _also_ lacks wide character support, this (and a bunch of other
439+
// calls to wc functions) will fail to link, but only if user code actually
440+
// uses them.
441+
template <>
442+
size_t GetLength<wchar_t>(constwchar_t* s) {
443+
returnwcslen(s);
444+
}
445+
446+
#endif// GTEST_HAS_STD_WSTRING
447+
425448
// Prints a null-terminated C-style string to the ostream.
426449
template <typename Char>
427450
voidPrintCStringTo(const Char* s, ostream* os) {
428451
if (s == nullptr) {
429452
*os << "NULL";
430453
} else {
431454
*os << ImplicitCast_<constvoid*>(s) << " pointing to ";
432-
PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
455+
PrintCharsAsStringTo(s, GetLength(s), os);
433456
}
434457
}
435458

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit a39ad67

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 49495eacfdbda3f4b6ba219923fedbb2e3f99376
PR-URL: #65317 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 24a76e1 commit a39ad67

3 files changed

Lines changed: 90 additions & 21 deletions

File tree

β€Ždeps/googletest/include/gtest/gtest-printers.hβ€Ž

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,12 @@ class [[nodiscard]] UniversalTersePrinter<const wchar_t*> {
11731173
}
11741174
}
11751175
};
1176-
#endif
11771176

11781177
template <>
1179-
class[[nodiscard]] UniversalTersePrinter<wchar_t*> {
1180-
public:
1181-
staticvoidPrint(wchar_t* str, ::std::ostream* os) {
1182-
UniversalTersePrinter<constwchar_t*>::Print(str, os);
1183-
}
1184-
};
1178+
class[[nodiscard]] UniversalTersePrinter<wchar_t*>
1179+
: public UniversalTersePrinter<constwchar_t*> {};
1180+
1181+
#endif// GTEST_HAS_STD_WSTRING
11851182

11861183
template <typename T>
11871184
voidUniversalTersePrint(const T& value, ::std::ostream* os) {

β€Ždeps/googletest/include/gtest/internal/gtest-port.hβ€Ž

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,71 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
500500
#endif// defined(_MSC_VER) || defined(__BORLANDC__)
501501
#endif// GTEST_HAS_EXCEPTIONS
502502

503-
#ifndef GTEST_HAS_STD_WSTRING
504-
// The user didn't tell us whether ::std::wstring is available, so we need
505-
// to figure it out.
503+
// 1. Calculate default GTEST_HAS_STD_WSTRING values based on STL capabilities.
504+
#if defined(_MSVC_STL_VERSION)
505+
// Microsoft's STL implementation always supports ::std::wstring.
506+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
507+
508+
#elif defined(_LIBCPP_VERSION)
509+
// Modern libc++ always defines _LIBCPP_HAS_WIDE_CHARACTERS; its value
510+
// determines whether wide characters are supported.
511+
// Older libc++ omits a definition for _LIBCPP_HAS_NO_WIDE_CHARACTERS when wide
512+
// characters are supported.
513+
#if (defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
514+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
515+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
516+
#else
517+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
518+
#endif
519+
520+
#elif defined(__GLIBCXX__)
521+
#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T
522+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
523+
#else
524+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
525+
#endif
526+
527+
#else
528+
// Unknown standard library implementation; fall back looking at the OS.
529+
//
530+
// Always let the user override the defaults in this case; they might have more
531+
// information about what's supported than we do.
532+
#if defined(GTEST_OS_LINUX_ANDROID)
533+
// Android started supporting std::wstring with API Level 21 (Lollipop).
534+
#defineGTEST_HAS_STD_WSTRING_DEFAULT (__ANDROID_API__ >= 21)
535+
// The following platforms are known not to support ::std::wstring; assume it's
536+
// supported on all others.
537+
//
506538
// Cygwin 1.7 and below doesn't support ::std::wstring.
507-
// Solaris' libc++ doesn't support it either. Android has
508-
// no support for it at least as recent as Froyo (2.2).
509-
#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
510-
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
511-
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
512-
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
513-
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
514-
#defineGTEST_HAS_STD_WSTRING1
539+
// Solaris' libc++ doesn't support it either.
540+
#elif defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || \
541+
defined(GTEST_OS_HAIKU) || defined(GTEST_OS_ESP32) || \
542+
defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
543+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
544+
defined(GTEST_OS_NRF52)
545+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
515546
#else
516-
#defineGTEST_HAS_STD_WSTRING0
547+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
548+
#endif
549+
#endif
550+
551+
// 2. Validate explicit user overrides (if user passed -DGTEST_HAS_*=1) against
552+
// what the standard library implementation tells us it supports.
553+
#if defined(GTEST_HAS_STD_WSTRING) && GTEST_HAS_STD_WSTRING
554+
#if defined(_LIBCPP_VERSION) && \
555+
((defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
556+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS))
557+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libc++ wide character support.
558+
#elif defined(__GLIBCXX__) && \
559+
!(defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
560+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libstdc++ wide character support.
561+
#endif
562+
#endif
563+
564+
// 3. Set final values if not explicitly overridden by user
565+
#if !defined(GTEST_HAS_STD_WSTRING)
566+
#defineGTEST_HAS_STD_WSTRINGGTEST_HAS_STD_WSTRING_DEFAULT
517567
#endif
518-
#endif// GTEST_HAS_STD_WSTRING
519568

520569
#ifndef GTEST_HAS_FILE_SYSTEM
521570
// Most platforms support a file system.

β€Ždeps/googletest/src/gtest-printers.ccβ€Ž

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include<iomanip>
5151
#include<ios>
5252
#include<ostream>// NOLINT
53+
#include<string>
5354
#include<string_view>
5455
#include<type_traits>
5556

@@ -422,14 +423,36 @@ void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
422423

423424
namespace {
424425

426+
template <typename Char>
427+
size_tGetLength(const Char* s) {
428+
return std::char_traits<Char>::length(s);
429+
}
430+
431+
#if !GTEST_HAS_STD_WSTRING
432+
433+
// If GTEST_HAS_STD_WSTRING is unset because the standard library has disabled
434+
// wide character support, std::char_traits<wchar_t> won't be defined, which
435+
// will cause a compile error, even if user code never actually could print a
436+
// wide cstring. In that case, instead use `wcslen` directly.
437+
//
438+
// If `libc` _also_ lacks wide character support, this (and a bunch of other
439+
// calls to wc functions) will fail to link, but only if user code actually
440+
// uses them.
441+
template <>
442+
size_t GetLength<wchar_t>(constwchar_t* s) {
443+
returnwcslen(s);
444+
}
445+
446+
#endif// GTEST_HAS_STD_WSTRING
447+
425448
// Prints a null-terminated C-style string to the ostream.
426449
template <typename Char>
427450
voidPrintCStringTo(const Char* s, ostream* os) {
428451
if (s == nullptr) {
429452
*os << "NULL";
430453
} else {
431454
*os << ImplicitCast_<constvoid*>(s) << " pointing to ";
432-
PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
455+
PrintCharsAsStringTo(s, GetLength(s), os);
433456
}
434457
}
435458

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit a39ad67

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 49495eacfdbda3f4b6ba219923fedbb2e3f99376
PR-URL: #65317 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 24a76e1 commit a39ad67

3 files changed

Lines changed: 90 additions & 21 deletions

File tree

β€Ždeps/googletest/include/gtest/gtest-printers.hβ€Ž

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,12 @@ class [[nodiscard]] UniversalTersePrinter<const wchar_t*> {
11731173
}
11741174
}
11751175
};
1176-
#endif
11771176

11781177
template <>
1179-
class[[nodiscard]] UniversalTersePrinter<wchar_t*> {
1180-
public:
1181-
staticvoidPrint(wchar_t* str, ::std::ostream* os) {
1182-
UniversalTersePrinter<constwchar_t*>::Print(str, os);
1183-
}
1184-
};
1178+
class[[nodiscard]] UniversalTersePrinter<wchar_t*>
1179+
: public UniversalTersePrinter<constwchar_t*> {};
1180+
1181+
#endif// GTEST_HAS_STD_WSTRING
11851182

11861183
template <typename T>
11871184
voidUniversalTersePrint(const T& value, ::std::ostream* os) {

β€Ždeps/googletest/include/gtest/internal/gtest-port.hβ€Ž

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,71 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
500500
#endif// defined(_MSC_VER) || defined(__BORLANDC__)
501501
#endif// GTEST_HAS_EXCEPTIONS
502502

503-
#ifndef GTEST_HAS_STD_WSTRING
504-
// The user didn't tell us whether ::std::wstring is available, so we need
505-
// to figure it out.
503+
// 1. Calculate default GTEST_HAS_STD_WSTRING values based on STL capabilities.
504+
#if defined(_MSVC_STL_VERSION)
505+
// Microsoft's STL implementation always supports ::std::wstring.
506+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
507+
508+
#elif defined(_LIBCPP_VERSION)
509+
// Modern libc++ always defines _LIBCPP_HAS_WIDE_CHARACTERS; its value
510+
// determines whether wide characters are supported.
511+
// Older libc++ omits a definition for _LIBCPP_HAS_NO_WIDE_CHARACTERS when wide
512+
// characters are supported.
513+
#if (defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
514+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
515+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
516+
#else
517+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
518+
#endif
519+
520+
#elif defined(__GLIBCXX__)
521+
#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T
522+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
523+
#else
524+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
525+
#endif
526+
527+
#else
528+
// Unknown standard library implementation; fall back looking at the OS.
529+
//
530+
// Always let the user override the defaults in this case; they might have more
531+
// information about what's supported than we do.
532+
#if defined(GTEST_OS_LINUX_ANDROID)
533+
// Android started supporting std::wstring with API Level 21 (Lollipop).
534+
#defineGTEST_HAS_STD_WSTRING_DEFAULT (__ANDROID_API__ >= 21)
535+
// The following platforms are known not to support ::std::wstring; assume it's
536+
// supported on all others.
537+
//
506538
// Cygwin 1.7 and below doesn't support ::std::wstring.
507-
// Solaris' libc++ doesn't support it either. Android has
508-
// no support for it at least as recent as Froyo (2.2).
509-
#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
510-
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
511-
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
512-
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
513-
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
514-
#defineGTEST_HAS_STD_WSTRING1
539+
// Solaris' libc++ doesn't support it either.
540+
#elif defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || \
541+
defined(GTEST_OS_HAIKU) || defined(GTEST_OS_ESP32) || \
542+
defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
543+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
544+
defined(GTEST_OS_NRF52)
545+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
515546
#else
516-
#defineGTEST_HAS_STD_WSTRING0
547+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
548+
#endif
549+
#endif
550+
551+
// 2. Validate explicit user overrides (if user passed -DGTEST_HAS_*=1) against
552+
// what the standard library implementation tells us it supports.
553+
#if defined(GTEST_HAS_STD_WSTRING) && GTEST_HAS_STD_WSTRING
554+
#if defined(_LIBCPP_VERSION) && \
555+
((defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
556+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS))
557+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libc++ wide character support.
558+
#elif defined(__GLIBCXX__) && \
559+
!(defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
560+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libstdc++ wide character support.
561+
#endif
562+
#endif
563+
564+
// 3. Set final values if not explicitly overridden by user
565+
#if !defined(GTEST_HAS_STD_WSTRING)
566+
#defineGTEST_HAS_STD_WSTRINGGTEST_HAS_STD_WSTRING_DEFAULT
517567
#endif
518-
#endif// GTEST_HAS_STD_WSTRING
519568

520569
#ifndef GTEST_HAS_FILE_SYSTEM
521570
// Most platforms support a file system.

β€Ždeps/googletest/src/gtest-printers.ccβ€Ž

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include<iomanip>
5151
#include<ios>
5252
#include<ostream>// NOLINT
53+
#include<string>
5354
#include<string_view>
5455
#include<type_traits>
5556

@@ -422,14 +423,36 @@ void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
422423

423424
namespace {
424425

426+
template <typename Char>
427+
size_tGetLength(const Char* s) {
428+
return std::char_traits<Char>::length(s);
429+
}
430+
431+
#if !GTEST_HAS_STD_WSTRING
432+
433+
// If GTEST_HAS_STD_WSTRING is unset because the standard library has disabled
434+
// wide character support, std::char_traits<wchar_t> won't be defined, which
435+
// will cause a compile error, even if user code never actually could print a
436+
// wide cstring. In that case, instead use `wcslen` directly.
437+
//
438+
// If `libc` _also_ lacks wide character support, this (and a bunch of other
439+
// calls to wc functions) will fail to link, but only if user code actually
440+
// uses them.
441+
template <>
442+
size_t GetLength<wchar_t>(constwchar_t* s) {
443+
returnwcslen(s);
444+
}
445+
446+
#endif// GTEST_HAS_STD_WSTRING
447+
425448
// Prints a null-terminated C-style string to the ostream.
426449
template <typename Char>
427450
voidPrintCStringTo(const Char* s, ostream* os) {
428451
if (s == nullptr) {
429452
*os << "NULL";
430453
} else {
431454
*os << ImplicitCast_<constvoid*>(s) << " pointing to ";
432-
PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
455+
PrintCharsAsStringTo(s, GetLength(s), os);
433456
}
434457
}
435458

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit a39ad67

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 49495eacfdbda3f4b6ba219923fedbb2e3f99376
PR-URL: #65317 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 24a76e1 commit a39ad67

3 files changed

Lines changed: 90 additions & 21 deletions

File tree

β€Ždeps/googletest/include/gtest/gtest-printers.hβ€Ž

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,12 @@ class [[nodiscard]] UniversalTersePrinter<const wchar_t*> {
11731173
}
11741174
}
11751175
};
1176-
#endif
11771176

11781177
template <>
1179-
class[[nodiscard]] UniversalTersePrinter<wchar_t*> {
1180-
public:
1181-
staticvoidPrint(wchar_t* str, ::std::ostream* os) {
1182-
UniversalTersePrinter<constwchar_t*>::Print(str, os);
1183-
}
1184-
};
1178+
class[[nodiscard]] UniversalTersePrinter<wchar_t*>
1179+
: public UniversalTersePrinter<constwchar_t*> {};
1180+
1181+
#endif// GTEST_HAS_STD_WSTRING
11851182

11861183
template <typename T>
11871184
voidUniversalTersePrint(const T& value, ::std::ostream* os) {

β€Ždeps/googletest/include/gtest/internal/gtest-port.hβ€Ž

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,71 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
500500
#endif// defined(_MSC_VER) || defined(__BORLANDC__)
501501
#endif// GTEST_HAS_EXCEPTIONS
502502

503-
#ifndef GTEST_HAS_STD_WSTRING
504-
// The user didn't tell us whether ::std::wstring is available, so we need
505-
// to figure it out.
503+
// 1. Calculate default GTEST_HAS_STD_WSTRING values based on STL capabilities.
504+
#if defined(_MSVC_STL_VERSION)
505+
// Microsoft's STL implementation always supports ::std::wstring.
506+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
507+
508+
#elif defined(_LIBCPP_VERSION)
509+
// Modern libc++ always defines _LIBCPP_HAS_WIDE_CHARACTERS; its value
510+
// determines whether wide characters are supported.
511+
// Older libc++ omits a definition for _LIBCPP_HAS_NO_WIDE_CHARACTERS when wide
512+
// characters are supported.
513+
#if (defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
514+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
515+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
516+
#else
517+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
518+
#endif
519+
520+
#elif defined(__GLIBCXX__)
521+
#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T
522+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
523+
#else
524+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
525+
#endif
526+
527+
#else
528+
// Unknown standard library implementation; fall back looking at the OS.
529+
//
530+
// Always let the user override the defaults in this case; they might have more
531+
// information about what's supported than we do.
532+
#if defined(GTEST_OS_LINUX_ANDROID)
533+
// Android started supporting std::wstring with API Level 21 (Lollipop).
534+
#defineGTEST_HAS_STD_WSTRING_DEFAULT (__ANDROID_API__ >= 21)
535+
// The following platforms are known not to support ::std::wstring; assume it's
536+
// supported on all others.
537+
//
506538
// Cygwin 1.7 and below doesn't support ::std::wstring.
507-
// Solaris' libc++ doesn't support it either. Android has
508-
// no support for it at least as recent as Froyo (2.2).
509-
#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
510-
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
511-
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
512-
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
513-
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
514-
#defineGTEST_HAS_STD_WSTRING1
539+
// Solaris' libc++ doesn't support it either.
540+
#elif defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || \
541+
defined(GTEST_OS_HAIKU) || defined(GTEST_OS_ESP32) || \
542+
defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
543+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
544+
defined(GTEST_OS_NRF52)
545+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
515546
#else
516-
#defineGTEST_HAS_STD_WSTRING0
547+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
548+
#endif
549+
#endif
550+
551+
// 2. Validate explicit user overrides (if user passed -DGTEST_HAS_*=1) against
552+
// what the standard library implementation tells us it supports.
553+
#if defined(GTEST_HAS_STD_WSTRING) && GTEST_HAS_STD_WSTRING
554+
#if defined(_LIBCPP_VERSION) && \
555+
((defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
556+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS))
557+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libc++ wide character support.
558+
#elif defined(__GLIBCXX__) && \
559+
!(defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
560+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libstdc++ wide character support.
561+
#endif
562+
#endif
563+
564+
// 3. Set final values if not explicitly overridden by user
565+
#if !defined(GTEST_HAS_STD_WSTRING)
566+
#defineGTEST_HAS_STD_WSTRINGGTEST_HAS_STD_WSTRING_DEFAULT
517567
#endif
518-
#endif// GTEST_HAS_STD_WSTRING
519568

520569
#ifndef GTEST_HAS_FILE_SYSTEM
521570
// Most platforms support a file system.

β€Ždeps/googletest/src/gtest-printers.ccβ€Ž

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include<iomanip>
5151
#include<ios>
5252
#include<ostream>// NOLINT
53+
#include<string>
5354
#include<string_view>
5455
#include<type_traits>
5556

@@ -422,14 +423,36 @@ void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
422423

423424
namespace {
424425

426+
template <typename Char>
427+
size_tGetLength(const Char* s) {
428+
return std::char_traits<Char>::length(s);
429+
}
430+
431+
#if !GTEST_HAS_STD_WSTRING
432+
433+
// If GTEST_HAS_STD_WSTRING is unset because the standard library has disabled
434+
// wide character support, std::char_traits<wchar_t> won't be defined, which
435+
// will cause a compile error, even if user code never actually could print a
436+
// wide cstring. In that case, instead use `wcslen` directly.
437+
//
438+
// If `libc` _also_ lacks wide character support, this (and a bunch of other
439+
// calls to wc functions) will fail to link, but only if user code actually
440+
// uses them.
441+
template <>
442+
size_t GetLength<wchar_t>(constwchar_t* s) {
443+
returnwcslen(s);
444+
}
445+
446+
#endif// GTEST_HAS_STD_WSTRING
447+
425448
// Prints a null-terminated C-style string to the ostream.
426449
template <typename Char>
427450
voidPrintCStringTo(const Char* s, ostream* os) {
428451
if (s == nullptr) {
429452
*os << "NULL";
430453
} else {
431454
*os << ImplicitCast_<constvoid*>(s) << " pointing to ";
432-
PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
455+
PrintCharsAsStringTo(s, GetLength(s), os);
433456
}
434457
}
435458

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit a39ad67

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 49495eacfdbda3f4b6ba219923fedbb2e3f99376
PR-URL: #65317 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 24a76e1 commit a39ad67

3 files changed

Lines changed: 90 additions & 21 deletions

File tree

β€Ždeps/googletest/include/gtest/gtest-printers.hβ€Ž

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,12 @@ class [[nodiscard]] UniversalTersePrinter<const wchar_t*> {
11731173
}
11741174
}
11751175
};
1176-
#endif
11771176

11781177
template <>
1179-
class[[nodiscard]] UniversalTersePrinter<wchar_t*> {
1180-
public:
1181-
staticvoidPrint(wchar_t* str, ::std::ostream* os) {
1182-
UniversalTersePrinter<constwchar_t*>::Print(str, os);
1183-
}
1184-
};
1178+
class[[nodiscard]] UniversalTersePrinter<wchar_t*>
1179+
: public UniversalTersePrinter<constwchar_t*> {};
1180+
1181+
#endif// GTEST_HAS_STD_WSTRING
11851182

11861183
template <typename T>
11871184
voidUniversalTersePrint(const T& value, ::std::ostream* os) {

β€Ždeps/googletest/include/gtest/internal/gtest-port.hβ€Ž

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,71 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
500500
#endif// defined(_MSC_VER) || defined(__BORLANDC__)
501501
#endif// GTEST_HAS_EXCEPTIONS
502502

503-
#ifndef GTEST_HAS_STD_WSTRING
504-
// The user didn't tell us whether ::std::wstring is available, so we need
505-
// to figure it out.
503+
// 1. Calculate default GTEST_HAS_STD_WSTRING values based on STL capabilities.
504+
#if defined(_MSVC_STL_VERSION)
505+
// Microsoft's STL implementation always supports ::std::wstring.
506+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
507+
508+
#elif defined(_LIBCPP_VERSION)
509+
// Modern libc++ always defines _LIBCPP_HAS_WIDE_CHARACTERS; its value
510+
// determines whether wide characters are supported.
511+
// Older libc++ omits a definition for _LIBCPP_HAS_NO_WIDE_CHARACTERS when wide
512+
// characters are supported.
513+
#if (defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
514+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
515+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
516+
#else
517+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
518+
#endif
519+
520+
#elif defined(__GLIBCXX__)
521+
#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T
522+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
523+
#else
524+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
525+
#endif
526+
527+
#else
528+
// Unknown standard library implementation; fall back looking at the OS.
529+
//
530+
// Always let the user override the defaults in this case; they might have more
531+
// information about what's supported than we do.
532+
#if defined(GTEST_OS_LINUX_ANDROID)
533+
// Android started supporting std::wstring with API Level 21 (Lollipop).
534+
#defineGTEST_HAS_STD_WSTRING_DEFAULT (__ANDROID_API__ >= 21)
535+
// The following platforms are known not to support ::std::wstring; assume it's
536+
// supported on all others.
537+
//
506538
// Cygwin 1.7 and below doesn't support ::std::wstring.
507-
// Solaris' libc++ doesn't support it either. Android has
508-
// no support for it at least as recent as Froyo (2.2).
509-
#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
510-
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
511-
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
512-
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
513-
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
514-
#defineGTEST_HAS_STD_WSTRING1
539+
// Solaris' libc++ doesn't support it either.
540+
#elif defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || \
541+
defined(GTEST_OS_HAIKU) || defined(GTEST_OS_ESP32) || \
542+
defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
543+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
544+
defined(GTEST_OS_NRF52)
545+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
515546
#else
516-
#defineGTEST_HAS_STD_WSTRING0
547+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
548+
#endif
549+
#endif
550+
551+
// 2. Validate explicit user overrides (if user passed -DGTEST_HAS_*=1) against
552+
// what the standard library implementation tells us it supports.
553+
#if defined(GTEST_HAS_STD_WSTRING) && GTEST_HAS_STD_WSTRING
554+
#if defined(_LIBCPP_VERSION) && \
555+
((defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
556+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS))
557+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libc++ wide character support.
558+
#elif defined(__GLIBCXX__) && \
559+
!(defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
560+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libstdc++ wide character support.
561+
#endif
562+
#endif
563+
564+
// 3. Set final values if not explicitly overridden by user
565+
#if !defined(GTEST_HAS_STD_WSTRING)
566+
#defineGTEST_HAS_STD_WSTRINGGTEST_HAS_STD_WSTRING_DEFAULT
517567
#endif
518-
#endif// GTEST_HAS_STD_WSTRING
519568

520569
#ifndef GTEST_HAS_FILE_SYSTEM
521570
// Most platforms support a file system.

β€Ždeps/googletest/src/gtest-printers.ccβ€Ž

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include<iomanip>
5151
#include<ios>
5252
#include<ostream>// NOLINT
53+
#include<string>
5354
#include<string_view>
5455
#include<type_traits>
5556

@@ -422,14 +423,36 @@ void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
422423

423424
namespace {
424425

426+
template <typename Char>
427+
size_tGetLength(const Char* s) {
428+
return std::char_traits<Char>::length(s);
429+
}
430+
431+
#if !GTEST_HAS_STD_WSTRING
432+
433+
// If GTEST_HAS_STD_WSTRING is unset because the standard library has disabled
434+
// wide character support, std::char_traits<wchar_t> won't be defined, which
435+
// will cause a compile error, even if user code never actually could print a
436+
// wide cstring. In that case, instead use `wcslen` directly.
437+
//
438+
// If `libc` _also_ lacks wide character support, this (and a bunch of other
439+
// calls to wc functions) will fail to link, but only if user code actually
440+
// uses them.
441+
template <>
442+
size_t GetLength<wchar_t>(constwchar_t* s) {
443+
returnwcslen(s);
444+
}
445+
446+
#endif// GTEST_HAS_STD_WSTRING
447+
425448
// Prints a null-terminated C-style string to the ostream.
426449
template <typename Char>
427450
voidPrintCStringTo(const Char* s, ostream* os) {
428451
if (s == nullptr) {
429452
*os << "NULL";
430453
} else {
431454
*os << ImplicitCast_<constvoid*>(s) << " pointing to ";
432-
PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
455+
PrintCharsAsStringTo(s, GetLength(s), os);
433456
}
434457
}
435458

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit a39ad67

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 49495eacfdbda3f4b6ba219923fedbb2e3f99376
PR-URL: #65317 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 24a76e1 commit a39ad67

3 files changed

Lines changed: 90 additions & 21 deletions

File tree

β€Ždeps/googletest/include/gtest/gtest-printers.hβ€Ž

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,12 @@ class [[nodiscard]] UniversalTersePrinter<const wchar_t*> {
11731173
}
11741174
}
11751175
};
1176-
#endif
11771176

11781177
template <>
1179-
class[[nodiscard]] UniversalTersePrinter<wchar_t*> {
1180-
public:
1181-
staticvoidPrint(wchar_t* str, ::std::ostream* os) {
1182-
UniversalTersePrinter<constwchar_t*>::Print(str, os);
1183-
}
1184-
};
1178+
class[[nodiscard]] UniversalTersePrinter<wchar_t*>
1179+
: public UniversalTersePrinter<constwchar_t*> {};
1180+
1181+
#endif// GTEST_HAS_STD_WSTRING
11851182

11861183
template <typename T>
11871184
voidUniversalTersePrint(const T& value, ::std::ostream* os) {

β€Ždeps/googletest/include/gtest/internal/gtest-port.hβ€Ž

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,71 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
500500
#endif// defined(_MSC_VER) || defined(__BORLANDC__)
501501
#endif// GTEST_HAS_EXCEPTIONS
502502

503-
#ifndef GTEST_HAS_STD_WSTRING
504-
// The user didn't tell us whether ::std::wstring is available, so we need
505-
// to figure it out.
503+
// 1. Calculate default GTEST_HAS_STD_WSTRING values based on STL capabilities.
504+
#if defined(_MSVC_STL_VERSION)
505+
// Microsoft's STL implementation always supports ::std::wstring.
506+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
507+
508+
#elif defined(_LIBCPP_VERSION)
509+
// Modern libc++ always defines _LIBCPP_HAS_WIDE_CHARACTERS; its value
510+
// determines whether wide characters are supported.
511+
// Older libc++ omits a definition for _LIBCPP_HAS_NO_WIDE_CHARACTERS when wide
512+
// characters are supported.
513+
#if (defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
514+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
515+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
516+
#else
517+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
518+
#endif
519+
520+
#elif defined(__GLIBCXX__)
521+
#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T
522+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
523+
#else
524+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
525+
#endif
526+
527+
#else
528+
// Unknown standard library implementation; fall back looking at the OS.
529+
//
530+
// Always let the user override the defaults in this case; they might have more
531+
// information about what's supported than we do.
532+
#if defined(GTEST_OS_LINUX_ANDROID)
533+
// Android started supporting std::wstring with API Level 21 (Lollipop).
534+
#defineGTEST_HAS_STD_WSTRING_DEFAULT (__ANDROID_API__ >= 21)
535+
// The following platforms are known not to support ::std::wstring; assume it's
536+
// supported on all others.
537+
//
506538
// Cygwin 1.7 and below doesn't support ::std::wstring.
507-
// Solaris' libc++ doesn't support it either. Android has
508-
// no support for it at least as recent as Froyo (2.2).
509-
#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
510-
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
511-
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
512-
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
513-
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
514-
#defineGTEST_HAS_STD_WSTRING1
539+
// Solaris' libc++ doesn't support it either.
540+
#elif defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || \
541+
defined(GTEST_OS_HAIKU) || defined(GTEST_OS_ESP32) || \
542+
defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
543+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
544+
defined(GTEST_OS_NRF52)
545+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
515546
#else
516-
#defineGTEST_HAS_STD_WSTRING0
547+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
548+
#endif
549+
#endif
550+
551+
// 2. Validate explicit user overrides (if user passed -DGTEST_HAS_*=1) against
552+
// what the standard library implementation tells us it supports.
553+
#if defined(GTEST_HAS_STD_WSTRING) && GTEST_HAS_STD_WSTRING
554+
#if defined(_LIBCPP_VERSION) && \
555+
((defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
556+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS))
557+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libc++ wide character support.
558+
#elif defined(__GLIBCXX__) && \
559+
!(defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
560+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libstdc++ wide character support.
561+
#endif
562+
#endif
563+
564+
// 3. Set final values if not explicitly overridden by user
565+
#if !defined(GTEST_HAS_STD_WSTRING)
566+
#defineGTEST_HAS_STD_WSTRINGGTEST_HAS_STD_WSTRING_DEFAULT
517567
#endif
518-
#endif// GTEST_HAS_STD_WSTRING
519568

520569
#ifndef GTEST_HAS_FILE_SYSTEM
521570
// Most platforms support a file system.

β€Ždeps/googletest/src/gtest-printers.ccβ€Ž

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include<iomanip>
5151
#include<ios>
5252
#include<ostream>// NOLINT
53+
#include<string>
5354
#include<string_view>
5455
#include<type_traits>
5556

@@ -422,14 +423,36 @@ void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
422423

423424
namespace {
424425

426+
template <typename Char>
427+
size_tGetLength(const Char* s) {
428+
return std::char_traits<Char>::length(s);
429+
}
430+
431+
#if !GTEST_HAS_STD_WSTRING
432+
433+
// If GTEST_HAS_STD_WSTRING is unset because the standard library has disabled
434+
// wide character support, std::char_traits<wchar_t> won't be defined, which
435+
// will cause a compile error, even if user code never actually could print a
436+
// wide cstring. In that case, instead use `wcslen` directly.
437+
//
438+
// If `libc` _also_ lacks wide character support, this (and a bunch of other
439+
// calls to wc functions) will fail to link, but only if user code actually
440+
// uses them.
441+
template <>
442+
size_t GetLength<wchar_t>(constwchar_t* s) {
443+
returnwcslen(s);
444+
}
445+
446+
#endif// GTEST_HAS_STD_WSTRING
447+
425448
// Prints a null-terminated C-style string to the ostream.
426449
template <typename Char>
427450
voidPrintCStringTo(const Char* s, ostream* os) {
428451
if (s == nullptr) {
429452
*os << "NULL";
430453
} else {
431454
*os << ImplicitCast_<constvoid*>(s) << " pointing to ";
432-
PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
455+
PrintCharsAsStringTo(s, GetLength(s), os);
433456
}
434457
}
435458

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit a39ad67

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 49495eacfdbda3f4b6ba219923fedbb2e3f99376
PR-URL: #65317 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 24a76e1 commit a39ad67

3 files changed

Lines changed: 90 additions & 21 deletions

File tree

β€Ždeps/googletest/include/gtest/gtest-printers.hβ€Ž

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,12 @@ class [[nodiscard]] UniversalTersePrinter<const wchar_t*> {
11731173
}
11741174
}
11751175
};
1176-
#endif
11771176

11781177
template <>
1179-
class[[nodiscard]] UniversalTersePrinter<wchar_t*> {
1180-
public:
1181-
staticvoidPrint(wchar_t* str, ::std::ostream* os) {
1182-
UniversalTersePrinter<constwchar_t*>::Print(str, os);
1183-
}
1184-
};
1178+
class[[nodiscard]] UniversalTersePrinter<wchar_t*>
1179+
: public UniversalTersePrinter<constwchar_t*> {};
1180+
1181+
#endif// GTEST_HAS_STD_WSTRING
11851182

11861183
template <typename T>
11871184
voidUniversalTersePrint(const T& value, ::std::ostream* os) {

β€Ždeps/googletest/include/gtest/internal/gtest-port.hβ€Ž

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,71 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
500500
#endif// defined(_MSC_VER) || defined(__BORLANDC__)
501501
#endif// GTEST_HAS_EXCEPTIONS
502502

503-
#ifndef GTEST_HAS_STD_WSTRING
504-
// The user didn't tell us whether ::std::wstring is available, so we need
505-
// to figure it out.
503+
// 1. Calculate default GTEST_HAS_STD_WSTRING values based on STL capabilities.
504+
#if defined(_MSVC_STL_VERSION)
505+
// Microsoft's STL implementation always supports ::std::wstring.
506+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
507+
508+
#elif defined(_LIBCPP_VERSION)
509+
// Modern libc++ always defines _LIBCPP_HAS_WIDE_CHARACTERS; its value
510+
// determines whether wide characters are supported.
511+
// Older libc++ omits a definition for _LIBCPP_HAS_NO_WIDE_CHARACTERS when wide
512+
// characters are supported.
513+
#if (defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
514+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
515+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
516+
#else
517+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
518+
#endif
519+
520+
#elif defined(__GLIBCXX__)
521+
#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T
522+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
523+
#else
524+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
525+
#endif
526+
527+
#else
528+
// Unknown standard library implementation; fall back looking at the OS.
529+
//
530+
// Always let the user override the defaults in this case; they might have more
531+
// information about what's supported than we do.
532+
#if defined(GTEST_OS_LINUX_ANDROID)
533+
// Android started supporting std::wstring with API Level 21 (Lollipop).
534+
#defineGTEST_HAS_STD_WSTRING_DEFAULT (__ANDROID_API__ >= 21)
535+
// The following platforms are known not to support ::std::wstring; assume it's
536+
// supported on all others.
537+
//
506538
// Cygwin 1.7 and below doesn't support ::std::wstring.
507-
// Solaris' libc++ doesn't support it either. Android has
508-
// no support for it at least as recent as Froyo (2.2).
509-
#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
510-
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
511-
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
512-
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
513-
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
514-
#defineGTEST_HAS_STD_WSTRING1
539+
// Solaris' libc++ doesn't support it either.
540+
#elif defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || \
541+
defined(GTEST_OS_HAIKU) || defined(GTEST_OS_ESP32) || \
542+
defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
543+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
544+
defined(GTEST_OS_NRF52)
545+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
515546
#else
516-
#defineGTEST_HAS_STD_WSTRING0
547+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
548+
#endif
549+
#endif
550+
551+
// 2. Validate explicit user overrides (if user passed -DGTEST_HAS_*=1) against
552+
// what the standard library implementation tells us it supports.
553+
#if defined(GTEST_HAS_STD_WSTRING) && GTEST_HAS_STD_WSTRING
554+
#if defined(_LIBCPP_VERSION) && \
555+
((defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
556+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS))
557+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libc++ wide character support.
558+
#elif defined(__GLIBCXX__) && \
559+
!(defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
560+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libstdc++ wide character support.
561+
#endif
562+
#endif
563+
564+
// 3. Set final values if not explicitly overridden by user
565+
#if !defined(GTEST_HAS_STD_WSTRING)
566+
#defineGTEST_HAS_STD_WSTRINGGTEST_HAS_STD_WSTRING_DEFAULT
517567
#endif
518-
#endif// GTEST_HAS_STD_WSTRING
519568

520569
#ifndef GTEST_HAS_FILE_SYSTEM
521570
// Most platforms support a file system.

β€Ždeps/googletest/src/gtest-printers.ccβ€Ž

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include<iomanip>
5151
#include<ios>
5252
#include<ostream>// NOLINT
53+
#include<string>
5354
#include<string_view>
5455
#include<type_traits>
5556

@@ -422,14 +423,36 @@ void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
422423

423424
namespace {
424425

426+
template <typename Char>
427+
size_tGetLength(const Char* s) {
428+
return std::char_traits<Char>::length(s);
429+
}
430+
431+
#if !GTEST_HAS_STD_WSTRING
432+
433+
// If GTEST_HAS_STD_WSTRING is unset because the standard library has disabled
434+
// wide character support, std::char_traits<wchar_t> won't be defined, which
435+
// will cause a compile error, even if user code never actually could print a
436+
// wide cstring. In that case, instead use `wcslen` directly.
437+
//
438+
// If `libc` _also_ lacks wide character support, this (and a bunch of other
439+
// calls to wc functions) will fail to link, but only if user code actually
440+
// uses them.
441+
template <>
442+
size_t GetLength<wchar_t>(constwchar_t* s) {
443+
returnwcslen(s);
444+
}
445+
446+
#endif// GTEST_HAS_STD_WSTRING
447+
425448
// Prints a null-terminated C-style string to the ostream.
426449
template <typename Char>
427450
voidPrintCStringTo(const Char* s, ostream* os) {
428451
if (s == nullptr) {
429452
*os << "NULL";
430453
} else {
431454
*os << ImplicitCast_<constvoid*>(s) << " pointing to ";
432-
PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
455+
PrintCharsAsStringTo(s, GetLength(s), os);
433456
}
434457
}
435458

0 commit comments

Comments
Β (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit a39ad67

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 49495eacfdbda3f4b6ba219923fedbb2e3f99376
PR-URL: #65317 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 24a76e1 commit a39ad67

3 files changed

Lines changed: 90 additions & 21 deletions

File tree

β€Ždeps/googletest/include/gtest/gtest-printers.hβ€Ž

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,15 +1173,12 @@ class [[nodiscard]] UniversalTersePrinter<const wchar_t*> {
11731173
}
11741174
}
11751175
};
1176-
#endif
11771176

11781177
template <>
1179-
class[[nodiscard]] UniversalTersePrinter<wchar_t*> {
1180-
public:
1181-
staticvoidPrint(wchar_t* str, ::std::ostream* os) {
1182-
UniversalTersePrinter<constwchar_t*>::Print(str, os);
1183-
}
1184-
};
1178+
class[[nodiscard]] UniversalTersePrinter<wchar_t*>
1179+
: public UniversalTersePrinter<constwchar_t*> {};
1180+
1181+
#endif// GTEST_HAS_STD_WSTRING
11851182

11861183
template <typename T>
11871184
voidUniversalTersePrint(const T& value, ::std::ostream* os) {

β€Ždeps/googletest/include/gtest/internal/gtest-port.hβ€Ž

Lines changed: 62 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,22 +500,71 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
500500
#endif// defined(_MSC_VER) || defined(__BORLANDC__)
501501
#endif// GTEST_HAS_EXCEPTIONS
502502

503-
#ifndef GTEST_HAS_STD_WSTRING
504-
// The user didn't tell us whether ::std::wstring is available, so we need
505-
// to figure it out.
503+
// 1. Calculate default GTEST_HAS_STD_WSTRING values based on STL capabilities.
504+
#if defined(_MSVC_STL_VERSION)
505+
// Microsoft's STL implementation always supports ::std::wstring.
506+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
507+
508+
#elif defined(_LIBCPP_VERSION)
509+
// Modern libc++ always defines _LIBCPP_HAS_WIDE_CHARACTERS; its value
510+
// determines whether wide characters are supported.
511+
// Older libc++ omits a definition for _LIBCPP_HAS_NO_WIDE_CHARACTERS when wide
512+
// characters are supported.
513+
#if (defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
514+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS)
515+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
516+
#else
517+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
518+
#endif
519+
520+
#elif defined(__GLIBCXX__)
521+
#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T
522+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
523+
#else
524+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
525+
#endif
526+
527+
#else
528+
// Unknown standard library implementation; fall back looking at the OS.
529+
//
530+
// Always let the user override the defaults in this case; they might have more
531+
// information about what's supported than we do.
532+
#if defined(GTEST_OS_LINUX_ANDROID)
533+
// Android started supporting std::wstring with API Level 21 (Lollipop).
534+
#defineGTEST_HAS_STD_WSTRING_DEFAULT (__ANDROID_API__ >= 21)
535+
// The following platforms are known not to support ::std::wstring; assume it's
536+
// supported on all others.
537+
//
506538
// Cygwin 1.7 and below doesn't support ::std::wstring.
507-
// Solaris' libc++ doesn't support it either. Android has
508-
// no support for it at least as recent as Froyo (2.2).
509-
#if (!(defined(GTEST_OS_LINUX_ANDROID) || defined(GTEST_OS_CYGWIN) || \
510-
defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || \
511-
defined(GTEST_OS_ESP32) || defined(GTEST_OS_ESP8266) || \
512-
defined(GTEST_OS_XTENSA) || defined(GTEST_OS_QURT) || \
513-
defined(GTEST_OS_NXP_QN9090) || defined(GTEST_OS_NRF52)))
514-
#defineGTEST_HAS_STD_WSTRING1
539+
// Solaris' libc++ doesn't support it either.
540+
#elif defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || \
541+
defined(GTEST_OS_HAIKU) || defined(GTEST_OS_ESP32) || \
542+
defined(GTEST_OS_ESP8266) || defined(GTEST_OS_XTENSA) || \
543+
defined(GTEST_OS_QURT) || defined(GTEST_OS_NXP_QN9090) || \
544+
defined(GTEST_OS_NRF52)
545+
#defineGTEST_HAS_STD_WSTRING_DEFAULT0
515546
#else
516-
#defineGTEST_HAS_STD_WSTRING0
547+
#defineGTEST_HAS_STD_WSTRING_DEFAULT1
548+
#endif
549+
#endif
550+
551+
// 2. Validate explicit user overrides (if user passed -DGTEST_HAS_*=1) against
552+
// what the standard library implementation tells us it supports.
553+
#if defined(GTEST_HAS_STD_WSTRING) && GTEST_HAS_STD_WSTRING
554+
#if defined(_LIBCPP_VERSION) && \
555+
((defined(_LIBCPP_HAS_WIDE_CHARACTERS) && !_LIBCPP_HAS_WIDE_CHARACTERS) || \
556+
defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS))
557+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libc++ wide character support.
558+
#elif defined(__GLIBCXX__) && \
559+
!(defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
560+
#error Cannot explicitly enable GTEST_HAS_STD_WSTRING without libstdc++ wide character support.
561+
#endif
562+
#endif
563+
564+
// 3. Set final values if not explicitly overridden by user
565+
#if !defined(GTEST_HAS_STD_WSTRING)
566+
#defineGTEST_HAS_STD_WSTRINGGTEST_HAS_STD_WSTRING_DEFAULT
517567
#endif
518-
#endif// GTEST_HAS_STD_WSTRING
519568

520569
#ifndef GTEST_HAS_FILE_SYSTEM
521570
// Most platforms support a file system.

β€Ždeps/googletest/src/gtest-printers.ccβ€Ž

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include<iomanip>
5151
#include<ios>
5252
#include<ostream>// NOLINT
53+
#include<string>
5354
#include<string_view>
5455
#include<type_traits>
5556

@@ -422,14 +423,36 @@ void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) {
422423

423424
namespace {
424425

426+
template <typename Char>
427+
size_tGetLength(const Char* s) {
428+
return std::char_traits<Char>::length(s);
429+
}
430+
431+
#if !GTEST_HAS_STD_WSTRING
432+
433+
// If GTEST_HAS_STD_WSTRING is unset because the standard library has disabled
434+
// wide character support, std::char_traits<wchar_t> won't be defined, which
435+
// will cause a compile error, even if user code never actually could print a
436+
// wide cstring. In that case, instead use `wcslen` directly.
437+
//
438+
// If `libc` _also_ lacks wide character support, this (and a bunch of other
439+
// calls to wc functions) will fail to link, but only if user code actually
440+
// uses them.
441+
template <>
442+
size_t GetLength<wchar_t>(constwchar_t* s) {
443+
returnwcslen(s);
444+
}
445+
446+
#endif// GTEST_HAS_STD_WSTRING
447+
425448
// Prints a null-terminated C-style string to the ostream.
426449
template <typename Char>
427450
voidPrintCStringTo(const Char* s, ostream* os) {
428451
if (s == nullptr) {
429452
*os << "NULL";
430453
} else {
431454
*os << ImplicitCast_<constvoid*>(s) << " pointing to ";
432-
PrintCharsAsStringTo(s, std::char_traits<Char>::length(s), os);
455+
PrintCharsAsStringTo(s, GetLength(s), os);
433456
}
434457
}
435458

0 commit comments

Comments
Β (0)