Diffusion sp4e-homework-lars-bertil 10f05a627c2d

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
10f05a627c2d
Actions

Authored by Tanzinul Islam <t_17_7@hotmail.com> on May 5 2018, 20:53.

Description

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

Details

Committed

Tanzinul Islam <t_17_7@hotmail.com>

May 5 2018, 20:53

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:5c7c365d5f3e: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
R9484:278aba369c41: Merge pull request #1589 from sgraham/rtti-build

Branches

Unknown

Tags

Unknown

Event Timeline

Tanzinul Islam <t_17_7@hotmail.com> committed R9484:10f05a627c2d: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 (authored by Tanzinul Islam <t_17_7@hotmail.com>).May 5 2018, 20:53

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
278aba369c41	Gennadiy Civil/GitHub	Merge pull request #1589 from sgraham/rtti-build	May 1 2018
95ec42d95f05	Scott Graham	Add no-exception and no-rtti to build matrix	May 1 2018
dc043e1ca6bd	Gennadiy Civil/GitHub	Merge pull request #1588 from gennadiycivil/master	Apr 25 2018
9af3793103ca	Gennadiy Civil	merged	Apr 25 2018
b539167cf025	Gennadiy Civil	merging,	Apr 25 2018
a6f06bf2fd3b	Gennadiy Civil/GitHub	Merge pull request #1582 from dnsunderland/parameterless	Apr 20 2018
884bcdaf182d	Gennadiy Civil/GitHub	Merge branch 'master' into parameterless	Apr 20 2018
1114a0202a31	Gennadiy Civil/GitHub	Merge pull request #1580 from gennadiycivil/master	Apr 19 2018
bb7a01834882	Gennadiy Civil	reverting, test	Apr 19 2018
7b4ee66f5f82	Gennadiy Civil	reverting just to test	Apr 19 2018
62a7c140a72a	Gennadiy Civil	testing	Apr 19 2018
2d3024f5bdc4	David Sunderland	Fix friend declaration to use GTEST_API_ decl spec.	Apr 19 2018
b2f97ab3179f	David Sunderland	Revert useless use of GTEST_API_ on WithoutMatchers decl.	Apr 19 2018
1c79ad7a56de	David Sunderland	Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem…	Apr 19 2018
d5725da96894	David Sunderland	Mark new GetWithoutMatchers method as part of the exported API, to address MSVC…	Apr 19 2018
7878b27dddee	David Sunderland	Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into…	Apr 19 2018
f6551f2d4538	David Sunderland	Don't use generalized initializer list; is C++11 extension.	Apr 19 2018
08cb06b19759	dnsunderland/GitHub	Merge branch 'master' into parameterless	Apr 19 2018
f437f8ca0d4d	David Sunderland	Clone of unsubmitted cr/176529515. Introduce parameterless expectations.	Apr 19 2018
f31243503276	Gennadiy Civil	more typos	Apr 18 2018
a0fd742639d8	Gennadiy Civil	msvc	Apr 18 2018
b00e281078c3	Gennadiy Civil	more typos	Apr 18 2018
881ee307a760	Gennadiy Civil	typo	Apr 18 2018
10e8ec2714a3	Gennadiy Civil	move only types docs	Apr 18 2018
4d554c391b66	Gennadiy Civil	typo	Apr 18 2018
b4cbf531e920	Gennadiy Civil	typo	Apr 18 2018
78d73814fae5	Gennadiy Civil	http://cl/193386206	Apr 18 2018
a48b95ef8166	Gennadiy Civil	Merge branch 'master' of github.com:google/googletest	Apr 18 2018
c56ba73a23e1	Gennadiy Civil	merge, explicit, ( should be it)	Apr 18 2018
4bd8c4638ada	Gennadiy Civil/GitHub	Merge pull request #1579 from gennadiycivil/master	Apr 18 2018
88311784e434	Gennadiy Civil	Merge branch 'master' of github.com:google/googletest	Apr 18 2018
4707c0ffd438	Gennadiy Civil	193353312	Apr 18 2018
4035d6ecc030	Gennadiy Civil/GitHub	Merge pull request #1577 from gennadiycivil/master	Apr 18 2018
80d6e26a9c17	Gennadiy Civil	cl/193060888	Apr 18 2018
5dccf6b79eb5	Gennadiy Civil	http://cl/193060888	Apr 17 2018
dff32aff97a6	Gennadiy Civil	http://cl/193060888	Apr 17 2018
3f88bb1831e4	Gennadiy Civil	test-meerging	Apr 16 2018
ec425d71601d	Gennadiy Civil	typo	Apr 16 2018
e4ab316c85c1	Gennadiy Civil	more msvc	Apr 16 2018
1944bc0f510f	Gennadiy Civil	typo	Apr 16 2018
e9eff488f9a4	Gennadiy Civil	msvc warnings	Apr 16 2018
bd2a1aed03c8	Gennadiy Civil	merging gmock generated matchers	Apr 16 2018
1f605414cc41	Gennadiy Civil/GitHub	Merge pull request #1576 from gennadiycivil/master	Apr 16 2018
9fba10315628	Gennadiy Civil	merging, testing, this should be it	Apr 16 2018
1c6e68cf6cdd	Gennadiy Civil	merging	Apr 16 2018
26c10dc7e650	Gennadiy Civil	merging	Apr 16 2018
247ded32368f	Gennadiy Civil/GitHub	Merge pull request #1571 from gennadiycivil/master	Apr 15 2018
d84eb86df5d1	Gennadiy Civil	more pizza	Apr 13 2018
f45728a5ac69	Gennadiy Civil	more OSX pizzas	Apr 13 2018
b74a1af00f17	Gennadiy Civil	osx pizzas	Apr 13 2018

Changes (37)

				Path
	M			.travis.yml
	M			ci/travis.sh
	M			googlemock/docs/CookBook.md
	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-function-mockers.h
	M			googlemock/include/gmock/gmock-generated-function-mockers.h.pump
	M			googlemock/include/gmock/gmock-generated-matchers.h
	M			googlemock/include/gmock/gmock-generated-matchers.h.pump
	M			googlemock/include/gmock/gmock-generated-nice-strict.h
	M			googlemock/include/gmock/gmock-generated-nice-strict.h.pump
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.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-matchers.cc
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googlemock/test/gmock-generated-function-mockers_test.cc
	M			googlemock/test/gmock-generated-internal-utils_test.cc
	M			googlemock/test/gmock-generated-matchers_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_output_test_.cc
	M			googlemock/test/gmock_output_test_golden.txt
	M			googletest/include/gtest/gtest.h
	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-port_test.cc
	M			googletest/test/gtest_unittest.cc