Merge pull request #1556 from google/revert-1551-master
a072611118df
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Apr 10 2018, 04:37.

Description

Merge pull request #1556 from google/revert-1551-master

Revert "gmock actions 2"

Committed

GitHub <noreply@github.com>

Apr 10 2018, 04:37

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:a072611118df: Merge pull request #1556 from google/revert-1551-master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Apr 10 2018, 04:37

	Commit			Author	Details	Committed
	ca54b673034f			Gennadiy Civil/GitHub	Revert "gmock actions 2"	Apr 10 2018

				Path
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h.pump
	M			googlemock/include/gmock/gmock-generated-matchers.h.pump
	M			googlemock/include/gmock/gmock-generated-nice-strict.h.pump
	M			googlemock/include/gmock/gmock-more-matchers.h
	M			googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
	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/test/gmock-actions_test.cc
	M			googlemock/test/gmock_output_test_.cc
	M			googletest/include/gtest/gtest.h