Merge pull request #1089 from nico/stdstring
7cc548dcbf26
Actions

Authored by Billy Donahue <BillyDonahue@users.noreply.github.com> on May 16 2017, 23:00.

Description

Merge pull request #1089 from nico/stdstring

Use std::string and ::string explicitly in gtest and gmock code.

Committed

GitHub <noreply@github.com>

May 16 2017, 23:00

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:7cc548dcbf26: Merge pull request #1089 from nico/stdstring (authored by Billy Donahue <BillyDonahue@users.noreply.github.com>).May 16 2017, 23:00

	Commit			Author	Details	Committed
	09fd5b3ebfaa			Nico Weber	Use std::string and ::string explicitly in gtest and gmock code.	May 15 2017

				Path
	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-cardinalities.cc
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googlemock/test/gmock-generated-function-mockers_test.cc
	M			googlemock/test/gmock-generated-matchers_test.cc
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock-more-actions_test.cc
	M			googlemock/test/gmock-nice-strict_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_stress_test.cc
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest-spi.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-param-util.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/gtest-death-test_test.cc
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest_unittest.cc