From c1ae0a497586edd38b0261846b8e4afdcfa30f0b Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 14 Sep 2020 07:33:19 -0700 Subject: Export of internal Abseil changes -- 14d42e9d0b8aed0c0f00900cd6fd790908930de5 by Gennadiy Rozental : Fix gcc ci build command for LTS PiperOrigin-RevId: 331543198 -- f1655ec91a4ad656dd1100cf2e134d08941278ca by Abseil Team : Consistently document size_type return value of all map/set types. PiperOrigin-RevId: 331528359 GitOrigin-RevId: 14d42e9d0b8aed0c0f00900cd6fd790908930de5 Change-Id: I33ebba4acb3e5918e4e112f03c81aba529dcd0b4 --- absl/container/btree_map.h | 2 +- absl/container/btree_set.h | 2 +- absl/container/flat_hash_map.h | 3 ++- absl/container/flat_hash_set.h | 3 ++- absl/container/node_hash_map.h | 3 ++- absl/container/node_hash_set.h | 3 ++- ci/linux_gcc-latest_libstdcxx_bazel.sh | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/absl/container/btree_map.h b/absl/container/btree_map.h index 448ac48a..abc09b0a 100644 --- a/absl/container/btree_map.h +++ b/absl/container/btree_map.h @@ -185,7 +185,7 @@ class btree_map // template size_type erase(const K& key): // // Erases the element with the matching key, if it exists, returning the - // number of elements erased. + // number of elements erased (0 or 1). using Base::erase; // btree_map::insert() diff --git a/absl/container/btree_set.h b/absl/container/btree_set.h index d3e78866..21ef0a03 100644 --- a/absl/container/btree_set.h +++ b/absl/container/btree_set.h @@ -183,7 +183,7 @@ class btree_set // template size_type erase(const K& key): // // Erases the element with the matching key, if it exists, returning the - // number of elements erased. + // number of elements erased (0 or 1). using Base::erase; // btree_set::insert() diff --git a/absl/container/flat_hash_map.h b/absl/container/flat_hash_map.h index dbd37d3c..74def0df 100644 --- a/absl/container/flat_hash_map.h +++ b/absl/container/flat_hash_map.h @@ -234,7 +234,8 @@ class flat_hash_map : public absl::container_internal::raw_hash_map< // // size_type erase(const key_type& key): // - // Erases the element with the matching key, if it exists. + // Erases the element with the matching key, if it exists, returning the + // number of elements erased (0 or 1). using Base::erase; // flat_hash_map::insert() diff --git a/absl/container/flat_hash_set.h b/absl/container/flat_hash_set.h index 94be6e3d..81e145aa 100644 --- a/absl/container/flat_hash_set.h +++ b/absl/container/flat_hash_set.h @@ -227,7 +227,8 @@ class flat_hash_set // // size_type erase(const key_type& key): // - // Erases the element with the matching key, if it exists. + // Erases the element with the matching key, if it exists, returning the + // number of elements erased (0 or 1). using Base::erase; // flat_hash_set::insert() diff --git a/absl/container/node_hash_map.h b/absl/container/node_hash_map.h index 9852ff7f..7a39f628 100644 --- a/absl/container/node_hash_map.h +++ b/absl/container/node_hash_map.h @@ -225,7 +225,8 @@ class node_hash_map // // size_type erase(const key_type& key): // - // Erases the element with the matching key, if it exists. + // Erases the element with the matching key, if it exists, returning the + // number of elements erased (0 or 1). using Base::erase; // node_hash_map::insert() diff --git a/absl/container/node_hash_set.h b/absl/container/node_hash_set.h index 56bab5c2..56ce3b66 100644 --- a/absl/container/node_hash_set.h +++ b/absl/container/node_hash_set.h @@ -217,7 +217,8 @@ class node_hash_set // // size_type erase(const key_type& key): // - // Erases the element with the matching key, if it exists. + // Erases the element with the matching key, if it exists, returning the + // number of elements erased (0 or 1). using Base::erase; // node_hash_set::insert() diff --git a/ci/linux_gcc-latest_libstdcxx_bazel.sh b/ci/linux_gcc-latest_libstdcxx_bazel.sh index cd15f710..b327405c 100755 --- a/ci/linux_gcc-latest_libstdcxx_bazel.sh +++ b/ci/linux_gcc-latest_libstdcxx_bazel.sh @@ -75,7 +75,7 @@ for std in ${STD}; do ${DOCKER_CONTAINER} \ /bin/sh -c " cp -r /abseil-cpp-ro/* /abseil-cpp/ - if [[ -n \"${ALTERNATE_OPTIONS:-}\" ]]; then + if [ -n \"${ALTERNATE_OPTIONS:-}\" ]; then cp ${ALTERNATE_OPTIONS:-} absl/base/options.h || exit 1 fi /usr/local/bin/bazel test ... \ -- cgit v1.2.3