Merge pull request #1959 from robinlinden:remove-msvc-workarounds
7a0680dc2230
Actions

Authored by Gennadiy Civil <misterg@google.com> on Nov 14 2018, 03:10.

Description

Merge pull request #1959 from robinlinden:remove-msvc-workarounds

PiperOrigin-RevId: 221356626

Committed

Gennadiy Civil <misterg@google.com>

Nov 14 2018, 03:10

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
48021336904c	Robin Lindén	Add back warning suppression that shouldn't have been removed	Nov 10 2018
a3a42514f1a9	Robin Lindén	Define GTEST_DISABLE_MSC_WARNINGS_PUSH/POP for all compilers	Nov 10 2018
c43603f288f4	Robin Lindén	Remove GTEST_HAS_HASH_SET/MAP check	Nov 10 2018
826656b25f62	Robin Lindén	Remove workarounds for unsupported MSVC versions	Nov 10 2018

				Path
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/internal/gmock-port.h
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-generated-function-mockers_test.cc
	M			googletest/cmake/internal_utils.cmake
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest.cc
	M			googletest/test/gtest_unittest.cc