Diffusion sp4e-homework-lars-bertil 85f059f03d56

Merge pull request #3 from google/master
85f059f03d56
Actions

Authored by Chris Johnson <chrisjohnsonmail@gmail.com> on Aug 28 2019, 01:00.

Description

Merge pull request #3 from google/master

Update master

Details

Committed

GitHub <noreply@github.com>

Aug 28 2019, 01:00

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:130e5aa86a7a: Merge pull request #2 from google/master
R9484:fdd6a1dc8c74: Merge pull request #2382 from kuzkry:dead-metafunction

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:85f059f03d56: Merge pull request #3 from google/master (authored by Chris Johnson <chrisjohnsonmail@gmail.com>).Aug 28 2019, 01:00

Merged Changes

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

Commit	Author	Details	Committed
fdd6a1dc8c74	Gennadiy Civil	Merge pull request #2382 from kuzkry:dead-metafunction	Aug 27 2019
6a3d632f40a1	misterg/Gennadiy Civil	Googletest export	Aug 26 2019
ed2eef654373	Abseil Team/Xiaoyi Zhang	Googletest export	Aug 23 2019
db1b739943e9	kuzkry/Xiaoyi Zhang	Googletest export	Aug 23 2019
46525e1e5dfc	Xiaoyi Zhang	Merge pull request #2394 from kuzkry:custom-type-traits-duplication-of-custom…	Aug 23 2019
c6d884096ae5	Xiaoyi Zhang	Merge pull request #2401 from kuzkry:custom-type-traits-add_lvalue_reference	Aug 23 2019
9bf34ace7194	Xiaoyi Zhang	Merge pull request #2400 from kuzkry:custom-type-traits-enable_if	Aug 23 2019
fb49e6c16449	Xiaoyi Zhang	Merge pull request #2393 from kuzkry:custom-type-traits-remove_const	Aug 21 2019
d1ad644db4b9	Abseil Team/Xiaoyi Zhang	Googletest export	Aug 21 2019
c9ccac7cb734	misterg/Gennadiy Civil	Googletest export	Aug 19 2019
d5e9e0c38f85	Gennadiy Civil	Merge pull request #2397 from kuzkry:custom-type-traits-is_reference	Aug 19 2019
30e58a89a42b	Gennadiy Civil	Merge pull request #2381 from Yannic:fix_bazel	Aug 19 2019
fcffabb5beb8	Abseil Team/Gennadiy Civil	Googletest export	Aug 19 2019
410b52985e3d	Abseil Team/Gennadiy Civil	Googletest export	Aug 19 2019
27e17f7851e2	misterg/Gennadiy Civil	Googletest export	Aug 16 2019
eb78ee170ac9	misterg/Gennadiy Civil	Googletest export	Aug 16 2019
976b37fe93d1	misterg/Gennadiy Civil	Googletest export	Aug 16 2019
44de8697835d	Krystian Kuzniarek	remove a dead metafunction	Aug 16 2019
e9d5f427b56a	misterg/Gennadiy Civil	Googletest export	Aug 15 2019
d44b137fd104	Abseil Team/Gennadiy Civil	Googletest export	Aug 15 2019
4083746e61ae	Gennadiy Civil	Merge pull request #2391 from adambadura:FixCygwin	Aug 15 2019
9b70406919fa	Gennadiy Civil	Merge pull request #2399 from kuzkry:custom-type-traits-is_same	Aug 15 2019
6aba4a5c45c0	Gennadiy Civil	Merge pull request #2382 from kuzkry:dead-metafunction	Aug 15 2019
c16f57053ce6	Gennadiy Civil	Merge pull request #2386 from kuzkry:outdated-comment	Aug 15 2019
a92e4a8e92cd	Abseil Team/Gennadiy Civil	Googletest export	Aug 15 2019
3835e15d72d4	Abseil Team/Gennadiy Civil	Googletest export	Aug 15 2019
de38f6380766	Abseil Team/Gennadiy Civil	Googletest export	Aug 15 2019
6a015ca1cb4e	Krystian Kuzniarek	reuse IndexSequence from googletest	Aug 14 2019
ec49fbca4cb8	Krystian Kuzniarek	remove custom implementations of std::is_same	Aug 14 2019
da76d01b984f	Krystian Kuzniarek	remove a custom implementation of std::is_reference	Aug 14 2019
364839ab142e	Krystian Kuzniarek	remove a custom implementation of std::remove_const	Aug 14 2019
11471da7938b	Krystian Kuzniarek	remove a custom implementation of std::enable_if	Aug 14 2019
2c2c9e33573d	Krystian Kuzniarek	remove a custom implementation of std::add_lvalue_reference	Aug 13 2019
6dbddd32b053	Adam Badura	Use -Wa,-mbig-obj for Cygwin/MinGW always	Aug 11 2019
871dcd1ff521	Krystian Kuzniarek	remove an outdated comment	Aug 11 2019
d51cce4fc7a5	Krystian Kuzniarek	remove a dead metafunction	Aug 8 2019
90a443f9c243	Gennadiy Civil	Merge pull request #2378 from kuzkry:markdown-table	Aug 7 2019
f8f5fcab3bc8	Abseil Team/Gennadiy Civil	Googletest export	Aug 7 2019
dd5402d9d4f3	Abseil Team/Gennadiy Civil	Googletest export	Aug 7 2019
79690c537563	Gennadiy Civil	Merge pull request #2372 from pitrou:issue2371-windows-crt-asserts	Aug 7 2019
800c9b30168f	Yannic Bonenberger	Update Bazel on Windows	Aug 7 2019
6fd262ecf787	Yannic Bonenberger	Prepare for Bazel incompatible changes	Aug 7 2019
6aa98d5cdc78	Krystian Kuzniarek	fix an improperly generated table	Aug 7 2019
f64f7bd36735	Gennadiy Civil	Merge pull request #2375 from kuzkry:broken-links	Aug 6 2019
07ec69a88652	CJ Johnson	Merge pull request #2359 from kuzkry:superfluous-mutable	Aug 6 2019
d0cb77dcce6c	Krystian Kuzniarek	fix broken links	Aug 6 2019
b4961ab1cbda	Abseil Team/Gennadiy Civil	Googletest export	Aug 6 2019
2f499db00e40	Gennadiy Civil	Merge pull request #2111 from knuto:pr/remove_slash	Aug 6 2019
9f8c3934d515	misterg/Gennadiy Civil	Googletest export	Aug 6 2019
c39ee9c460e6	Antoine Pitrou	Fix #2371: Redirect Windows CRT assertions to stderr	Aug 6 2019

Changes (243)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			.gitignore
	M			.travis.yml
	M			BUILD.bazel
	M			CMakeLists.txt
	M			CONTRIBUTING.md
	D			Makefile.am
	M			README.md
	M			WORKSPACE
	M			appveyor.yml
	V			{ci/build-linux-autotools.sh → googletest/test/gtest_skip_environment_check_output_test.py}
	M			ci/build-linux-bazel.sh
	M			ci/env-osx.sh
	M			ci/install-osx.sh
	D			configure.ac
	M			googlemock/CMakeLists.txt
	D			googlemock/Makefile.am
	M			googlemock/README.md
	D			googlemock/build-aux
	D			googlemock/build-aux/.keep
	D			googlemock/configure.ac
	D			googlemock/docs/CheatSheet.md
	D			googlemock/docs/CookBook.md
	D			googlemock/docs/DesignDoc.md
	D			googlemock/docs/Documentation.md
	D			googlemock/docs/ForDummies.md
	D			googlemock/docs/FrequentlyAskedQuestions.md
	D			googlemock/docs/KnownIssues.md
	A			googlemock/docs/cheat_sheet.md
	A			googlemock/docs/cook_book.md
	A			googlemock/docs/for_dummies.md
	A			googlemock/docs/gmock_faq.md
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-cardinalities.h
	M			googlemock/include/gmock/gmock-function-mocker.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
	D			googlemock/include/gmock/gmock-generated-nice-strict.h
	V			googlemock/include/gmock/{gmock-generated-nice-strict.h.pump → gmock-nice-strict.h}
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-actions.h
	V			googlemock/include/gmock/{gmock-nice-strict.h ← gmock-generated-nice-strict.h.pump}
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/gmock.h
	D			googlemock/include/gmock/internal/gmock-generated-internal-utils.h
	D			googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	D			googlemock/make
	D			googlemock/make/Makefile
	D			googlemock/msvc
	D			googlemock/msvc/2005
	D			googlemock/msvc/2005/gmock.sln
	D			googlemock/msvc/2005/gmock.vcproj
	D			googlemock/msvc/2005/gmock_config.vsprops
	D			googlemock/msvc/2005/gmock_main.vcproj
	D			googlemock/msvc/2005/gmock_test.vcproj
	D			googlemock/msvc/2010
	D			googlemock/msvc/2010/gmock.sln
	D			googlemock/msvc/2010/gmock.vcxproj
	D			googlemock/msvc/2010/gmock_config.props
	D			googlemock/msvc/2010/gmock_main.vcxproj
	D			googlemock/msvc/2010/gmock_test.vcxproj
	D			googlemock/msvc/2015
	D			googlemock/msvc/2015/gmock.sln
	D			googlemock/msvc/2015/gmock.vcxproj
	D			googlemock/msvc/2015/gmock_config.props
	D			googlemock/msvc/2015/gmock_main.vcxproj
	D			googlemock/msvc/2015/gmock_test.vcxproj
	M			googlemock/scripts/fuse_gmock_files.py
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/src/gmock.cc
	M			googlemock/src/gmock_main.cc
	M			googlemock/test/BUILD.bazel
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-cardinalities_test.cc
	M			googlemock/test/gmock-function-mocker_test.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googlemock/test/gmock-generated-function-mockers_test.cc
	D			googlemock/test/gmock-generated-internal-utils_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-nice-strict_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_all_test.cc
	M			googlemock/test/gmock_output_test.py
	M			googlemock/test/gmock_output_test_golden.txt
	M			googletest/CMakeLists.txt
	D			googletest/Makefile.am
	M			googletest/README.md
	M			googletest/cmake/internal_utils.cmake
	A			googletest/cmake/libgtest.la.in
	D			googletest/codegear
	D			googletest/codegear/gtest.cbproj
	D			googletest/codegear/gtest.groupproj
	D			googletest/codegear/gtest_all.cc
	D			googletest/codegear/gtest_link.cc
	D			googletest/codegear/gtest_main.cbproj
	D			googletest/codegear/gtest_unittest.cbproj
	D			googletest/configure.ac
	V			googletest/docs/{Pkgconfig.md → pkgconfig.md}
	D			googletest/docs/PumpManual.md
	D			googletest/docs/XcodeGuide.md
	M			googletest/docs/advanced.md
	M			googletest/docs/faq.md
	V			googletest/docs/{pkgconfig.md ← Pkgconfig.md}
	M			googletest/docs/primer.md
	A			googletest/docs/pump_manual.md
	M			googletest/docs/samples.md
	M			googletest/include/gtest/gtest-death-test.h
	M			googletest/include/gtest/gtest-matchers.h
	M			googletest/include/gtest/gtest-message.h
	V			googletest/include/gtest/{gtest-param-test.h ← gtest-param-test.h.pump}
	V			googletest/include/gtest/{gtest-param-test.h.pump → gtest-param-test.h}
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/gtest-test-part.h
	M			googletest/include/gtest/gtest-typed-test.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/gtest_pred_impl.h
	M			googletest/include/gtest/internal/gtest-death-test-internal.h
	M			googletest/include/gtest/internal/gtest-filepath.h
	M			googletest/include/gtest/internal/gtest-internal.h
	D			googletest/include/gtest/internal/gtest-param-util-generated.h
	D			googletest/include/gtest/internal/gtest-param-util-generated.h.pump
	M			googletest/include/gtest/internal/gtest-param-util.h
	M			googletest/include/gtest/internal/gtest-port-arch.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/include/gtest/internal/gtest-string.h
	M			googletest/include/gtest/internal/gtest-type-util.h
	M			googletest/include/gtest/internal/gtest-type-util.h.pump
	D			googletest/m4
	D			googletest/m4/acx_pthread.m4
	D			googletest/m4/gtest.m4
	D			googletest/make
	D			googletest/make/Makefile
	D			googletest/msvc
	D			googletest/msvc/2010
	D			googletest/msvc/2010/gtest-md.sln
	D			googletest/msvc/2010/gtest-md.vcxproj
	D			googletest/msvc/2010/gtest-md.vcxproj.filters
	D			googletest/msvc/2010/gtest.sln
	D			googletest/msvc/2010/gtest.vcxproj
	D			googletest/msvc/2010/gtest.vcxproj.filters
	D			googletest/msvc/2010/gtest_main-md.vcxproj
	D			googletest/msvc/2010/gtest_main-md.vcxproj.filters
	D			googletest/msvc/2010/gtest_main.vcxproj
	D			googletest/msvc/2010/gtest_main.vcxproj.filters
	D			googletest/msvc/2010/gtest_prod_test-md.vcxproj
	D			googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters
	D			googletest/msvc/2010/gtest_prod_test.vcxproj
	D			googletest/msvc/2010/gtest_prod_test.vcxproj.filters
	D			googletest/msvc/2010/gtest_unittest-md.vcxproj
	D			googletest/msvc/2010/gtest_unittest-md.vcxproj.filters
	D			googletest/msvc/2010/gtest_unittest.vcxproj
	D			googletest/msvc/2010/gtest_unittest.vcxproj.filters
	M			googletest/samples/prime_tables.h
	M			googletest/samples/sample1.cc
	M			googletest/samples/sample1.h
	M			googletest/samples/sample6_unittest.cc
	M			googletest/samples/sample7_unittest.cc
	M			googletest/samples/sample8_unittest.cc
	M			googletest/samples/sample9_unittest.cc
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-filepath.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-matchers.cc
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-printers.cc
	M			googletest/src/gtest-test-part.cc
	M			googletest/src/gtest-typed-test.cc
	M			googletest/src/gtest.cc
	M			googletest/src/gtest_main.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/googletest-catch-exceptions-test.py
	M			googletest/test/googletest-catch-exceptions-test_.cc
	M			googletest/test/googletest-death-test-test.cc
	M			googletest/test/googletest-death-test_ex_test.cc
	M			googletest/test/googletest-filepath-test.cc
	M			googletest/test/googletest-filter-unittest_.cc
	M			googletest/test/googletest-json-outfiles-test.py
	M			googletest/test/googletest-json-output-unittest.py
	M			googletest/test/googletest-list-tests-unittest_.cc
	M			googletest/test/googletest-listener-test.cc
	M			googletest/test/googletest-options-test.cc
	M			googletest/test/googletest-output-test-golden-lin.txt
	M			googletest/test/googletest-output-test.py
	M			googletest/test/googletest-output-test_.cc
	P			googletest/test/googletest-param-test-invalid-name1-test_.cc Copied to googletest/test/gtest_skip_in_environment_setup_test.cc
	M			googletest/test/googletest-param-test-invalid-name2-test_.cc
	M			googletest/test/googletest-param-test-test.cc
	M			googletest/test/googletest-param-test-test.h
	M			googletest/test/googletest-param-test2-test.cc
	M			googletest/test/googletest-port-test.cc
	M			googletest/test/googletest-printers-test.cc
	M			googletest/test/googletest-test-part-test.cc
	M			googletest/test/googletest-test2_test.cc
	M			googletest/test/googletest-throw-on-failure-test.py
	M			googletest/test/gtest-typed-test2_test.cc
	M			googletest/test/gtest-typed-test_test.cc
	M			googletest/test/gtest-typed-test_test.h
	M			googletest/test/gtest-unittest-api_test.cc
	M			googletest/test/gtest_assert_by_exception_test.cc
	M			googletest/test/gtest_environment_test.cc
	M			googletest/test/gtest_pred_impl_unittest.cc
	M			googletest/test/gtest_premature_exit_test.cc
	M			googletest/test/gtest_repeat_test.cc
	V			{googletest/test/gtest_skip_environment_check_output_test.py ← ci/build-linux-autotools.sh}
	P			googletest/test/gtest_skip_in_environment_setup_test.cc Copied from googletest/test/googletest-param-test-invalid-name1-test_.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfiles_test.py
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/test/gtest_xml_output_unittest_.cc
	M			googletest/test/gtest_xml_test_utils.py
	D			googletest/xcode
	D			googletest/xcode/Config
	D			googletest/xcode/Config/DebugProject.xcconfig
	D			googletest/xcode/Config/FrameworkTarget.xcconfig
	D			googletest/xcode/Config/General.xcconfig
	D			googletest/xcode/Config/ReleaseProject.xcconfig
	D			googletest/xcode/Config/StaticLibraryTarget.xcconfig
	D			googletest/xcode/Config/TestTarget.xcconfig
	D			googletest/xcode/Resources
	D			googletest/xcode/Resources/Info.plist
	D			googletest/xcode/Samples
	D			googletest/xcode/Samples/FrameworkSample
	D			googletest/xcode/Samples/FrameworkSample/Info.plist
	D			googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj
	D			googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
	D			googletest/xcode/Samples/FrameworkSample/runtests.sh
	D			googletest/xcode/Samples/FrameworkSample/widget.cc
	D			googletest/xcode/Samples/FrameworkSample/widget.h
	D			googletest/xcode/Samples/FrameworkSample/widget_test.cc
	D			googletest/xcode/Scripts
	D			googletest/xcode/Scripts/runtests.sh
	D			googletest/xcode/Scripts/versiongenerate.py
	D			googletest/xcode/gtest.xcodeproj
	D			googletest/xcode/gtest.xcodeproj/project.pbxproj
	M			library.json