summaryrefslogtreecommitdiffstats
path: root/googlemock/include
Commit message (Expand)AuthorAgeFilesLines
* Googletest exportAbseil Team2020-01-023-17/+98
* Googletest exportAbseil Team2020-01-023-98/+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 #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
| |/
* | 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 #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-223-9/+7
* | | Googletest exportAbseil Team2019-11-192-2/+2
| |/ |/|
* | fix a typorefs/pull/2547/headKrystian Kuzniarek2019-11-021-1/+1
|/
* Merge pull request #2533 from thejcannon:noexcept_specvslashg2019-11-011-20/+22
|\
| * Revert "Merge pull request #2498 from thejcannon:noexcept_spec"refs/pull/2533/headJoshua Cannon2019-10-231-20/+22
* | Googletest exportAbseil Team2019-10-311-4/+4
* | Googletest exportAbseil Team2019-10-311-2/+1
* | Googletest exportAbseil Team2019-10-291-1/+3
* | Merge pull request #2527 from PiotrNycz:gmock_prevent_return_ref_to_store_tem...vslashg2019-10-291-0/+4
|\ \
| * | Prevent using ReturnRef on reference to temporaryPiotr Nycz2019-10-221-0/+4
* | | Googletest exportAbseil Team2019-10-231-0/+47
| |/ |/|
* | Merge pull request #2514 from thejcannon:msvc_macro_issuevslashg2019-10-231-77/+31
|\ \
| * | Avoid recursive macrosrefs/pull/2514/headJoshua Cannon2019-10-111-22/+28
| * | Removing extraneous parenthesisJoshua Cannon2019-10-111-1/+1
| * | Evaluate and cat NARG in different macrosJoshua Cannon2019-10-111-8/+8
| * | Fix preprocessor testsJoshua Cannon2019-10-111-3/+1
| * | Workaround MSVC VA_ARGS weirdnessJoshua Cannon2019-10-111-66/+19
* | | Googletest exportAbseil Team2019-10-222-66/+28
* | | Googletest exportAbseil Team2019-10-221-2/+24
| |/ |/|
* | Googletest exportmisterg2019-10-181-24/+2
* | Googletest exportAbseil Team2019-10-181-4/+25
* | Googletest exportAbseil Team2019-10-171-2/+24
* | Add more override keywordsrefs/pull/2507/headRobert Luberda2019-10-114-62/+62
* | Merge pull request #2498 from thejcannon:noexcept_specGennadiy Civil2019-10-111-22/+20
|\ \
* \ \ Merge pull request #2498 from thejcannon:noexcept_specGennadiy Civil2019-10-111-20/+22
|\ \ \ | |/ /
| * | Fix spacingJoshua Cannon2019-10-071-3/+3
| * | Use the verbatim noexcept spec in MOCKED_METHODJoshua Cannon2019-10-071-10/+14
| |/
* | Googletest exportAbseil Team2019-10-111-2/+1
* | Merge pull request #2448 from kuzkry:bad-googletest-exportGennadiy Civil2019-10-102-4/+2
|\ \ | |/ |/|
| * square away the stuff that hasn't been merged in a manual reviewKrystian Kuzniarek2019-09-162-4/+2
* | Googletest exportAbseil Team2019-09-271-2/+4
|/
* Googletest exportkuzkry2019-09-162-17/+16
* Merge pull request #2387 from kuzkry:iffShaindel Schwartz2019-09-125-56/+64
|\
| * restore mistakenly removed iffs in their explicit formrefs/pull/2387/headKrystian Kuzniarek2019-08-205-56/+64
* | Googletest exportHosein Ghahremanzadeh2019-09-121-2/+2
* | Googletest exportkuzkry2019-09-063-9/+4
* | Merge pull request #2426 from kuzkry:#2396-postreviewGennadiy Civil2019-08-281-9/+9
|\ \
| * | post-review to db1b7399 (#2396)refs/pull/2426/headKrystian Kuzniarek2019-08-241-9/+9