diff options
| -rw-r--r-- | WORKSPACE | 8 | ||||
| -rw-r--r-- | absl/flags/internal/parse.h | 8 | ||||
| -rw-r--r-- | ci/cmake_common.sh | 2 |
3 files changed, 5 insertions, 13 deletions
@@ -20,11 +20,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # GoogleTest/GoogleMock framework. Used by most unit-tests. http_archive( - name = "com_google_googletest", # 2023-01-05T19:15:29Z - sha256 = "1c805208d019aabb8be3cddbc6098be8815ee5cf0a7baf526102528fd624c422", - strip_prefix = "googletest-934542165899c786cb5d8a710529c37184730183", + name = "com_google_googletest", # 2023-02-28T13:15:29Z + sha256 = "82ad62a4e26c199de52a707778334e80f6b195dd298d48d520d8507d2bcb88c4", + strip_prefix = "googletest-2d4f208765af7fa376b878860a7677ecc0bc390a", # Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh. - urls = ["https://github.com/google/googletest/archive/934542165899c786cb5d8a710529c37184730183.zip"], + urls = ["https://github.com/google/googletest/archive/2d4f208765af7fa376b878860a7677ecc0bc390a.zip"], ) # RE2 (the regular expression library used by GoogleTest) diff --git a/absl/flags/internal/parse.h b/absl/flags/internal/parse.h index b8c693c4..145e591d 100644 --- a/absl/flags/internal/parse.h +++ b/absl/flags/internal/parse.h @@ -32,7 +32,6 @@ namespace absl { ABSL_NAMESPACE_BEGIN namespace flags_internal { -enum class ArgvListAction { kRemoveParsedArgs, kKeepParsedArgs }; enum class UsageFlagsAction { kHandleUsage, kIgnoreUsage }; enum class OnUndefinedFlag { kIgnoreUndefined, @@ -44,13 +43,6 @@ std::vector<char*> ParseCommandLineImpl(int argc, char* argv[], UsageFlagsAction usage_flag_act, OnUndefinedFlag on_undef_flag); -// To be removed -inline std::vector<char*> ParseCommandLineImpl( - int argc, char* argv[], ArgvListAction /* arg_list_act */, - UsageFlagsAction usage_flag_act, OnUndefinedFlag on_undef_flag) { - return ParseCommandLineImpl(argc, argv, usage_flag_act, on_undef_flag); -} - // -------------------------------------------------------------------- // Inspect original command line diff --git a/ci/cmake_common.sh b/ci/cmake_common.sh index 64317425..f62bb8a1 100644 --- a/ci/cmake_common.sh +++ b/ci/cmake_common.sh @@ -14,7 +14,7 @@ # The commit of GoogleTest to be used in the CMake tests in this directory. # Keep this in sync with the commit in the WORKSPACE file. -readonly ABSL_GOOGLETEST_COMMIT="934542165899c786cb5d8a710529c37184730183" +readonly ABSL_GOOGLETEST_COMMIT="2d4f208765af7fa376b878860a7677ecc0bc390a" # Avoid depending on GitHub by looking for a cached copy of the commit first. if [[ -r "${KOKORO_GFILE_DIR:-}/distdir/${ABSL_GOOGLETEST_COMMIT}.zip" ]]; then |