summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock
diff options
context:
space:
mode:
authorDerek Mauro <dmauro@google.com>2021-08-13 16:42:35 (GMT)
committerDerek Mauro <dmauro@google.com>2021-08-13 16:42:35 (GMT)
commit0134d73a4902574269ff2e42827f7573d3df08ae (patch)
tree87285976729b65a760d02c4082de3a533dbf8197 /googlemock/include/gmock
parent8d8b488a8df5d355cf145c68d336626b18637c5d (diff)
parent97ff0fec11325d389630a4cb0e6949bc97b2f199 (diff)
downloadgoogletest-0134d73a4902574269ff2e42827f7573d3df08ae.zip
googletest-0134d73a4902574269ff2e42827f7573d3df08ae.tar.gz
googletest-0134d73a4902574269ff2e42827f7573d3df08ae.tar.bz2
Merge pull request #3504 from duianto:patch-1
PiperOrigin-RevId: 390486428
Diffstat (limited to 'googlemock/include/gmock')
-rw-r--r--googlemock/include/gmock/internal/gmock-internal-utils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h
index d7e2228..8ecfbf5 100644
--- a/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -279,7 +279,7 @@ class WithoutMatchers {
GTEST_API_ WithoutMatchers GetWithoutMatchers();
// Disable MSVC warnings for infinite recursion, since in this case the
-// the recursion is unreachable.
+// recursion is unreachable.
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4717)