Merge pull request #2387 from kuzkry:iff
c7a03daa99e7
Actions

Authored by Shaindel Schwartz <shaindel@google.com> on Sep 12 2019, 18:10.

Description

Merge pull request #2387 from kuzkry:iff

PiperOrigin-RevId: 268693457

Committed

Shaindel Schwartz <shaindel@google.com>

Sep 12 2019, 18:10

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

Shaindel Schwartz <shaindel@google.com> committed R9484:c7a03daa99e7: Merge pull request #2387 from kuzkry:iff (authored by Shaindel Schwartz <shaindel@google.com>).Sep 12 2019, 18:10

	Commit			Author	Details	Committed
	7bd4a7f3e9ae			Krystian Kuzniarek	restore mistakenly removed iffs in their explicit form	Aug 20 2019

				Path
	M			googlemock/docs/cheat_sheet.md
	M			googlemock/docs/cook_book.md
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-cardinalities.h
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/src/gmock.cc
	M			googlemock/test/gmock-cardinalities_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googletest/include/gtest/gtest-death-test.h
	M			googletest/include/gtest/gtest-matchers.h
	M			googletest/include/gtest/gtest-test-part.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/internal/gtest-filepath.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/include/gtest/internal/gtest-string.h
	M			googletest/samples/prime_tables.h
	M			googletest/samples/sample1.cc
	M			googletest/samples/sample1.h
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest.cc
	M			googletest/test/googletest-death-test-test.cc
	M			googletest/test/googletest-throw-on-failure-test.py
	M			googletest/test/gtest_environment_test.cc
	M			googletest/test/gtest_pred_impl_unittest.cc
	M			googletest/test/gtest_premature_exit_test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_unittest.cc