From b9d2e1f62f3d93c1c3197900ba7170fa5177ad23 Mon Sep 17 00:00:00 2001 From: Julian Arkenau Date: Sat, 25 Jun 2022 14:41:57 +0200 Subject: [PATCH 1/2] docs: update googletest README for release 1.12.0 --- googletest/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googletest/README.md b/googletest/README.md index d26b309e..8760d13e 100644 --- a/googletest/README.md +++ b/googletest/README.md @@ -25,7 +25,7 @@ When building GoogleTest as a standalone project, the typical workflow starts with ``` -git clone https://github.com/google/googletest.git -b release-1.11.0 +git clone https://github.com/google/googletest.git -b release-1.12.0 cd googletest # Main directory of the cloned repository. mkdir build # Create a directory to hold the build output. cd build @@ -94,7 +94,7 @@ include(FetchContent) FetchContent_Declare( googletest # Specify the commit you depend on and update it regularly. - URL https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.zip + URL https://github.com/google/googletest/archive/5376968f6948923e2411081fd9372e71a59d8e77.zip ) # For Windows: Prevent overriding the parent project's compiler/linker settings set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) From 9406a60c7839052e4944ea4dbc8344762a89f9bd Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 27 Jun 2022 13:15:39 -0700 Subject: [PATCH 2/2] Mark internal-only function as having internal linkage. PiperOrigin-RevId: 457550818 Change-Id: I9046801b64ce4581d742d650451332fd56489632 --- googlemock/src/gmock-spec-builders.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 658ad3fa..783c3124 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -435,7 +435,7 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked() return expectations_met; } -CallReaction intToCallReaction(int mock_behavior) { +static CallReaction intToCallReaction(int mock_behavior) { if (mock_behavior >= kAllow && mock_behavior <= kFail) { return static_cast(mock_behavior); }