aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock
Commit message (Collapse)AuthorAgeFilesLines
* Remove gcc 6 misleading indentations.Romain Geissler2017-10-252-13/+26
|
* Use gender-neutral pronouns in comments and docsJonathan Wakely2017-09-271-1/+1
|
* change links from former code.google.com to current github repositoryHerbert Thielen2017-08-314-4/+4
|
* Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-281-8/+27
|\
| * Support ref-qualified member functions in Property().Roman Perepelitsa2017-08-221-8/+27
| |
* | Adding a flag option to change the default mock typeAlyssa Wilk2017-08-102-1/+1
|/
* Merge pull request #1123 from chromy/upstream-141765019Gennadiy Civil2017-08-081-4/+4
|\ | | | | Fix typo in gmock-actions.h
| * Fix typo in gmock-actions.hHector Dearman2017-06-191-4/+4
| | | | | | | | This upstreams a Google-internal change (141765019).
* | Fixed misspelling in assertion message.Hector Dearman2017-06-191-1/+1
|/ | | | This upstreams a Google-internal change (146491438).
* Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-153-90/+90
| | | | | | | | | 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.
* googlemock: Support C++11 language with pre-C++11 libraryMark Mentovai2015-10-121-4/+4
| | | | | | This guards use of <type_traits> and its features with GTEST_HAS_STD_TYPE_TRAITS_, and std::function with GTEST_HAS_STD_FUNCTION_.
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-2523-0/+17082