diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2021-06-01 15:17:05 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2021-06-01 15:17:05 -0400 |
| commit | 69d6d103ecf71e1a57f99077664d37ff54bf883e (patch) | |
| tree | a8e1dbe1e1efd6445e6fcf64973e8f5cd51ef30a /absl/debugging | |
| parent | ebc3d7213cf73b26b5e44edff58c759ea44ee9aa (diff) | |
| parent | 278e0a071885a22dcd2fd1b5576cc44757299343 (diff) | |
Merge upstream LTS update 20210324.2
Diffstat (limited to 'absl/debugging')
| -rw-r--r-- | absl/debugging/failure_signal_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc index a9ed6ef9..3ddebd74 100644 --- a/absl/debugging/failure_signal_handler.cc +++ b/absl/debugging/failure_signal_handler.cc @@ -136,7 +136,8 @@ static bool SetupAlternateStackOnce() { #else const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; #endif - size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; + size_t stack_size = + (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) // Account for sanitizer instrumentation requiring additional stack space. |