diff options
| author |  Copybara-Service <copybara-worker@google.com> | 2023-02-22 10:52:21 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-02-22 10:52:21 -0800 |
| commit | 402e1319211cf19e455aa2a3b2de1f1235bb4326 (patch) | |
| tree | 8718ce8da0130fb6d4e2f2d8809f5f78aa899061 /absl/strings | |
| parent | 277af61c83028863dfac4260ad24b3d579f3201b (diff) | |
| parent | 6247f0e918bbc0519955d41b135069dcc2bbd453 (diff) | |
Merge pull request #1403 from AtariDreams:c++11
PiperOrigin-RevId: 511539869
Change-Id: I32d5e91537b078691988e7e6d3244c682eb8d7d2
Diffstat (limited to 'absl/strings')
| -rw-r--r-- | absl/strings/cord_buffer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/absl/strings/cord_buffer.h b/absl/strings/cord_buffer.h index 15494b31..a3600ac4 100644 --- a/absl/strings/cord_buffer.h +++ b/absl/strings/cord_buffer.h @@ -460,9 +460,7 @@ inline constexpr size_t CordBuffer::MaximumPayload() { } inline constexpr size_t CordBuffer::MaximumPayload(size_t block_size) { - // TODO(absl-team): Use std::min when C++11 support is dropped. - return (kCustomLimit < block_size ? kCustomLimit : block_size) - - cord_internal::kFlatOverhead; + return (std::min)(kCustomLimit, block_size) - cord_internal::kFlatOverhead; } inline CordBuffer CordBuffer::CreateWithDefaultLimit(size_t capacity) { |