aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
Commit message (Collapse)AuthorAgeFilesLines
* Mark new GetWithoutMatchers method as part of the exported API, to address ↵David Sunderland2018-04-181-1/+1
| | | | MSVC linker errors.
* Don't use generalized initializer list; is C++11 extension.David Sunderland2018-04-181-1/+1
|
* Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-181-0/+2
|
* ...mergingGennadiy Civil2018-04-111-1/+1
|
* mergingGennadiy Civil2018-04-101-7/+10
|
* mergeGennadiy Civil2018-04-102-11/+8
|\
| * Revert "gmock actions 2"Gennadiy Civil2018-04-092-16/+1
| |
| * formattingGennadiy Civil2018-04-091-1/+1
| |
| * more msvcGennadiy Civil2018-04-091-16/+0
| |
| * msvc 14Gennadiy Civil2018-04-091-0/+16
| |
| * And also silence for MSVS14Gennadiy Civil2018-04-091-2/+2
| |
| * preproc syntax ( I can never remember it)Gennadiy Civil2018-04-091-5/+9
| |
| * syntaxGennadiy Civil2018-04-091-2/+2
| |
| * cont.Gennadiy Civil2018-04-091-2/+2
| |
| * continuedGennadiy Civil2018-04-091-1/+0
| |
* | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵Gennadiy Civil2018-04-101-7/+10
|/ | | | errors before merging the PR
* more mcvs fixingGennadiy Civil2018-04-061-0/+12
|
* fixing MSVCGennadiy Civil2018-04-061-1/+1
|
* Merging gMock, 2Gennadiy Civil2018-04-051-42/+80
|
* merging gmock matchers 1Gennadiy Civil2018-04-041-6/+52
|
* merging, gmock -1Gennadiy Civil2018-03-221-35/+42
|
* merges-2Gennadiy Civil2018-03-052-4/+14
|
* gmock merging -2Gennadiy Civil2018-02-271-77/+119
|
* moving JoinAsTuple to internalGennadiy Civil2018-02-122-19/+19
|
* Pass the -Wmissing-declarations warning.David Benjamin2018-01-031-1/+1
| | | | | | This makes it easier to use GTest in projects that build with the -Wmissing-declarations warning. This fixes the warning in headers and source files, though not GTest's own tests as it is rather noisy there.
* Use gender-neutral pronouns in comments and docsJonathan Wakely2017-09-272-3/+3
|
* Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-281-1/+1
|\
| * Add function name to exception if there's no default actionMaurice Gilden2017-08-161-1/+1
| |
* | Handling invalid flag valuesAlyssa Wilk2017-08-161-1/+8
| |
* | Adding a flag option to change the default mock typeAlyssa Wilk2017-08-102-2/+25
|/
* Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-021-1/+1
|\ | | | | remove duplicated words
| * remove duplicated wordsLi Peng2016-04-271-1/+1
| | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
* | Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-154-14/+11
|/ | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.
* Fix link that's returned when running tests. #714Jacob Meacham2016-02-161-2/+2
|
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-257-0/+1935
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 23:53:33 +0000