diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2023-05-08 12:51:08 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2023-05-08 12:51:08 -0400 |
| commit | c15cec707b1c7d847e59d2db4d0b82b711a7ee6d (patch) | |
| tree | 79f448d5bbc8cf52917b0b091f0e1ab60a419c85 /absl/base/internal/low_level_alloc.cc | |
| parent | f4f2c1da90c4e6a0683c4e66c0268baa1b79cdf3 (diff) | |
| parent | c2435f8342c2d0ed8101cb43adfd605fdc52dca2 (diff) | |
| download | abseil-c15cec707b1c7d847e59d2db4d0b82b711a7ee6d.tar.gz abseil-c15cec707b1c7d847e59d2db4d0b82b711a7ee6d.tar.bz2 abseil-c15cec707b1c7d847e59d2db4d0b82b711a7ee6d.zip | |
Merge new upstream LTS 20230125.3
Diffstat (limited to 'absl/base/internal/low_level_alloc.cc')
| -rw-r--r-- | absl/base/internal/low_level_alloc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/base/internal/low_level_alloc.cc b/absl/base/internal/low_level_alloc.cc index 229ab916..662167b0 100644 --- a/absl/base/internal/low_level_alloc.cc +++ b/absl/base/internal/low_level_alloc.cc @@ -332,7 +332,7 @@ size_t GetPageSize() { #elif defined(__wasm__) || defined(__asmjs__) return getpagesize(); #else - return sysconf(_SC_PAGESIZE); + return static_cast<size_t>(sysconf(_SC_PAGESIZE)); #endif } @@ -364,7 +364,7 @@ LowLevelAlloc::Arena::Arena(uint32_t flags_value) } // L < meta_data_arena->mu -LowLevelAlloc::Arena *LowLevelAlloc::NewArena(int32_t flags) { +LowLevelAlloc::Arena *LowLevelAlloc::NewArena(uint32_t flags) { Arena *meta_data_arena = DefaultArena(); #ifndef ABSL_LOW_LEVEL_ALLOC_ASYNC_SIGNAL_SAFE_MISSING if ((flags & LowLevelAlloc::kAsyncSignalSafe) != 0) { |