Diffusion sp4e-homework-lars-bertil d4f77c1e3a34

Merge branch 'master' into win-libcxx2
d4f77c1e3a34
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Feb 27 2018, 16:00.

Description

Merge branch 'master' into win-libcxx2

Details

Committed

GitHub <noreply@github.com>

Feb 27 2018, 16:00

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:3498a1ac52de: Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
R9484:ac34e6c95092: Merge pull request #1472 from AndersSundmanTobii/master

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:d4f77c1e3a34: Merge branch 'master' into win-libcxx2 (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Feb 27 2018, 16:00

Merged Changes

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

Commit	Author	Details	Committed
ac34e6c95092	Gennadiy Civil/GitHub	Merge pull request #1472 from AndersSundmanTobii/master	Feb 26 2018
aa31660d18c9	Gennadiy Civil/GitHub	Merge branch 'master' into master	Feb 26 2018
1d324d849197	Gennadiy Civil/GitHub	Merge pull request #1475 from gennadiycivil/master	Feb 26 2018
4dbb4371741c	Gennadiy Civil	merging unittests - 5	Feb 26 2018
004f6a00b20e	Gennadiy Civil	merging unitests - check 4	Feb 23 2018
194c99b942f3	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 23 2018
3a4cf1a02ef4	Gennadiy Civil/GitHub	Merge pull request #1474 from gennadiycivil/master	Feb 23 2018
29e9ca877434	Gennadiy Civil	merging unitests, check	Feb 23 2018
3299a2386cf2	Gennadiy Civil	merging unittests - 2	Feb 23 2018
c0563458eef2	Gennadiy Civil/GitHub	Merge pull request #1473 from gennadiycivil/master	Feb 23 2018
b7e0294c5133	Gennadiy Civil	merging unitests	Feb 23 2018
70e1aad72c49	Gennadiy Civil/GitHub	Merge pull request #1471 from aleksejkozin/patch-1	Feb 23 2018
11e1dd257b80	Anders Sundman (asum)	Removed trailing comma in enum	Feb 23 2018
99bb4fe85a20	Aleksey Kozin/GitHub	Merge branch 'master' into patch-1	Feb 22 2018
a490fb7a9a00	Gennadiy Civil/GitHub	Merge pull request #1466 from pwnall/fix-death-warn	Feb 22 2018
06568301ec4a	Aleksey Kozin/GitHub	TEST() arguments are invalid in an example	Feb 22 2018
ac138b688537	Gennadiy Civil/GitHub	Merge branch 'master' into fix-death-warn	Feb 22 2018
32e62da22a1b	Gennadiy Civil/GitHub	Merge pull request #1469 from gennadiycivil/master	Feb 22 2018
df65632489dc	Gennadiy Civil	merges	Feb 22 2018
8a6158717bc1	Victor Costan	Fix unused function warning on Mac OS.	Feb 19 2018
3f0cf6b62ad1	Gennadiy Civil/GitHub	Merge pull request #1450 from pwnall/fix-printers	Feb 15 2018
8dd1eb5984fb	Gennadiy Civil/GitHub	Merge branch 'master' into fix-printers	Feb 15 2018
42140509b6fc	Gennadiy Civil/GitHub	Merge pull request #1459 from gennadiycivil/master	Feb 13 2018
8248169287b9	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 13 2018
a3e322b24f9a	Gennadiy Civil	cleanup, merges	Feb 13 2018
0d6a674f6102	Gennadiy Civil/GitHub	Merge pull request #1458 from gennadiycivil/master	Feb 13 2018
823f139bc7db	Gennadiy Civil/GitHub	Merge branch 'master' into fix-printers	Feb 13 2018
68e4f076e5e1	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 13 2018
09581b38523a	Gennadiy Civil	cleanup/merges	Feb 13 2018
38611c512152	Gennadiy Civil/GitHub	Merge pull request #1457 from gennadiycivil/master	Feb 13 2018
069724197c03	Gennadiy Civil	merging, cleaning up	Feb 13 2018
462ef92f75fd	Gennadiy Civil/GitHub	Merge pull request #1456 from gennadiycivil/master	Feb 13 2018
64290752e98e	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 13 2018
ab186a8c49a2	Gennadiy Civil	merges	Feb 13 2018
ffc5f5ad3cc1	Gennadiy Civil/GitHub	Merge pull request #1454 from gennadiycivil/master	Feb 13 2018
30d276da0346	Gennadiy Civil	cxxx11	Feb 13 2018
3b1fe3ec4527	Gennadiy Civil	clang warnings	Feb 13 2018
d7c966c4defe	Gennadiy Civil	clang warnings	Feb 13 2018
2a23ca00092b	Gennadiy Civil	https://travis-ci.org/google/googletest/jobs/340995238	Feb 13 2018
a66d209061eb	Gennadiy Civil	clang warning 'https://travis-ci.org/google/googletest/jobs/340987201'	Feb 13 2018
e76f4ee9fd16	Gennadiy Civil	clang warning https://travis-ci.org/google/googletest/jobs/340978022	Feb 13 2018
9e072812e302	Gennadiy Civil	merges	Feb 13 2018
9d1a80c0fbc0	Gennadiy Civil/GitHub	Merge pull request #1452 from gennadiycivil/master	Feb 12 2018
1a7732a48885	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 12 2018
225e6741acfa	Gennadiy Civil	moving JoinAsTuple to internal	Feb 12 2018
b3a1759eac70	Victor Costan	Fix std::iscntrl use in gtest-printers.cc	Feb 12 2018
222607a01963	Gennadiy Civil/GitHub	Merge pull request #1451 from gennadiycivil/master	Feb 12 2018
b94ba27d4471	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Feb 12 2018
d84f58ab1085	Gennadiy Civil	Merging, coniniue	Feb 12 2018
15392f1a38fa	Gennadiy Civil/GitHub	Merge pull request #1449 from gennadiycivil/master	Feb 10 2018

Changes (52)

				Path
	M			BUILD.bazel
	M			WORKSPACE
	M			appveyor.yml
	M			ci/build-linux-bazel.sh
	M			googlemock/docs/CookBook.md
	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/gmock.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-port.h
	M			googlemock/scripts/generator/cpp/ast.py
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/test/BUILD.bazel
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock_output_test.py
	M			googlemock/test/gmock_stress_test.cc
	M			googlemock/test/gmock_test.cc
	M			googlemock/test/gmock_test_utils.py
	M			googletest/cmake/internal_utils.cmake
	M			googletest/docs/AdvancedGuide.md
	M			googletest/docs/Documentation.md
	M			googletest/docs/FAQ.md
	M			googletest/docs/Primer.md
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/gtest_prod.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-filepath.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-printers.cc
	M			googletest/src/gtest-typed-test.cc
	M			googletest/src/gtest.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/gtest-death-test_test.cc
	M			googletest/test/gtest-param-test_test.cc
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest_all_test.cc
	P			googletest/test/gtest_assert_by_exception_test.cc Copied from googletest/test/gtest_throw_on_failure_ex_test.cc
	M			googletest/test/gtest_env_var_test.py
	M			googletest/test/gtest_env_var_test_.cc
	M			googletest/test/gtest_main_unittest.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_uninitialized_test_.cc
	M			googletest/test/gtest_unittest.cc
	M			googletest/xcode/Scripts/versiongenerate.py