summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
* Googletest exportkrzysio2019-12-161-18/+17
* Googletest exportAbseil Team2019-12-133-175/+40
* Merge pull request #2595 from kuzkry:remove-workaround_msvc-warning-4355Matt Calabrese2019-12-131-8/+0
|\
| * remove MSVC workaround: warning 4355refs/pull/2595/headKrystian Kuzniarek2019-11-221-8/+0
* | Merge pull request #2592 from kuzkry:remove-workaround_msvc-error-C2665Matt Calabrese2019-12-131-9/+0
|\ \
| * | remove MSVC workaround: error C2665refs/pull/2592/headKrystian Kuzniarek2019-11-221-9/+0
| |/
* | Merge pull request #2609 from kuzkry:revert-2596Mark Barolak2019-12-061-3/+10
|\ \
| * | Revert "remove MSVC workaround: wmain link error in the static library"refs/pull/2609/headKrystian Kuzniarek2019-11-271-2/+9
| * | Revert "unify googletest and googlemock main functions"Krystian Kuzniarek2019-11-271-1/+1
* | | Merge pull request #2594 from kuzkry:remove-workaround_msvc-unneeded-const-dr...Mark Barolak2019-12-051-17/+4
|\ \ \
| * | | remove MSVC workaround: cease const droppingrefs/pull/2594/headKrystian Kuzniarek2019-11-221-14/+3
| | |/ | |/|
* | | Googletest exportAbseil Team2019-12-021-0/+6
* | | Merge pull request #2603 from maximilianschwab:patch-1Mark Barolak2019-12-021-1/+1
|\ \ \
| * | | Fixed typorefs/pull/2603/headMaximilian Schwab2019-11-251-1/+1
* | | | Merge pull request #2583 from ChristophStrehle:masterGennadiy Rozental2019-11-271-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix compile break for Microsoft Visual Studio 2017 v141refs/pull/2583/headChristoph Strehle2019-11-211-1/+2
* | | | Merge pull request #2593 from kuzkry:remove-workaround_msvc-namespace-scope-f...Gennadiy Rozental2019-11-261-9/+4
|\ \ \ \
| * | | | remove MSVC workaround: accessing namespace scope from within nested classesrefs/pull/2593/headKrystian Kuzniarek2019-11-221-9/+4
| | |_|/ | |/| |
* | | | Merge pull request #2596 from kuzkry:remove-workaround_msvc-wmain-link-errorGennadiy Rozental2019-11-261-10/+3
|\ \ \ \
| * | | | unify googletest and googlemock main functionsrefs/pull/2596/headKrystian Kuzniarek2019-11-221-1/+1
| * | | | remove MSVC workaround: wmain link error in the static libraryKrystian Kuzniarek2019-11-221-9/+2
| |/ / /
* | | | Merge pull request #2597 from kuzkry:remove-workaround_Nokia-Sybian-SafeMatch...Gennadiy Rozental2019-11-261-49/+36
|\ \ \ \ | |_|_|/ |/| | |
| * | | remove Nokia's Symbian compiler workaround: SafeMatcherCastImplrefs/pull/2597/headKrystian Kuzniarek2019-11-221-49/+36
| * | | consistency fix for SafeMatcherCastImpl member functionsKrystian Kuzniarek2019-11-221-1/+1
| |/ /
* | | Googletest exportAbseil Team2019-11-226-25/+26
* | | Googletest exportAbseil Team2019-11-201-1/+1
* | | Googletest exportAbseil Team2019-11-192-2/+2
| |/ |/|
* | Merge pull request #2556 from ienorand:avoid-pkg-config-lpthread-cflagAndy Getz2019-11-132-2/+2
|\ \
| * | pkg-config: Remove pthread link flag from Cflagsrefs/pull/2556/headMartin Erik Werner2019-11-052-2/+2
* | | Merge pull request #2549 from kuzkry:pump-support-for-python-3Xiaoyi Zhang2019-11-051-6/+7
|\ \ \
| * | | pump.py: add support for Python 3refs/pull/2549/headKrystian Kuzniarek2019-11-021-6/+7
| | |/ | |/|
* | | Merge pull request #2548 from kuzkry:update-pump-manualXiaoyi Zhang2019-11-051-12/+9
|\ \ \
| * | | update pump_manual.mdrefs/pull/2548/headKrystian Kuzniarek2019-11-021-12/+9
| |/ /
* | | fix a typorefs/pull/2547/headKrystian Kuzniarek2019-11-021-1/+1
|/ /
* | Merge pull request #2533 from thejcannon:noexcept_specvslashg2019-11-012-20/+51
|\ \
| * | Revert "Merge pull request #2498 from thejcannon:noexcept_spec"refs/pull/2533/headJoshua Cannon2019-10-232-20/+51
* | | Googletest exportAbseil Team2019-10-311-4/+4
* | | Googletest exportAbseil Team2019-10-311-2/+1
* | | Googletest exportmisterg2019-10-302-1480/+0
* | | Googletest exportmisterg2019-10-297-175/+75
* | | Googletest exportmhermas2019-10-293-394/+440
* | | Googletest exportAbseil Team2019-10-291-1/+3
* | | Merge pull request #2527 from PiotrNycz:gmock_prevent_return_ref_to_store_tem...vslashg2019-10-292-0/+40
|\ \ \
| * | | variable names corrected (followed google coding style)refs/pull/2527/headPiotr Nycz2019-10-251-14/+14
| * | | Apply 80chars limitPiotr Nycz2019-10-251-1/+2
| * | | Tests simplified and names corrected (POD->scalar)Piotr Nycz2019-10-241-49/+18
| * | | Added more tests to verify: ReturnRef not accept temporaryPiotr Nycz2019-10-231-15/+57
| * | | Added tests verifying that temporaries are accepted by ReturnRefPiotr Nycz2019-10-221-0/+24
| * | | Prevent using ReturnRef on reference to temporaryPiotr Nycz2019-10-221-0/+4
* | | | Googletest exportAbseil Team2019-10-291-13/+0