aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
Commit message (Collapse)AuthorAgeFilesLines
* 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