diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /www/iridium/files/patch-base_debug_stack__trace.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/iridium/files/patch-base_debug_stack__trace.cc')
| -rw-r--r-- | www/iridium/files/patch-base_debug_stack__trace.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/iridium/files/patch-base_debug_stack__trace.cc b/www/iridium/files/patch-base_debug_stack__trace.cc index 81fe117bfb42..11fa52e6456b 100644 --- a/www/iridium/files/patch-base_debug_stack__trace.cc +++ b/www/iridium/files/patch-base_debug_stack__trace.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace.cc.orig 2025-05-07 06:48:23 UTC +--- base/debug/stack_trace.cc.orig 2025-11-06 10:11:34 UTC +++ base/debug/stack_trace.cc -@@ -268,7 +268,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { +@@ -292,7 +292,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { // Symbols are not expected to be reliable when gn args specifies // symbol_level=0. return false; @@ -9,7 +9,7 @@ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 return false; -@@ -321,7 +321,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream +@@ -357,7 +357,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream } return; } @@ -19,7 +19,7 @@ } std::string StackTrace::ToString() const { -@@ -330,7 +332,7 @@ std::string StackTrace::ToString() const { +@@ -366,7 +368,7 @@ std::string StackTrace::ToString() const { std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; @@ -28,7 +28,7 @@ OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); -@@ -354,7 +356,7 @@ bool StackTrace::ShouldSuppressOutput() { +@@ -390,7 +392,7 @@ bool StackTrace::ShouldSuppressOutput() { } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { |