Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'refs/heads/master' into flag-default | Alyssa Wilk | 2017-08-28 | 1 | -8/+27 | |
|\ \ | ||||||
| * | | Support ref-qualified member functions in Property(). | Roman Perepelitsa | 2017-08-22 | 1 | -8/+27 | |
| | | | ||||||
* | | | Adding a flag option to change the default mock type | Alyssa Wilk | 2017-08-10 | 2 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1123 from chromy/upstream-141765019 | Gennadiy Civil | 2017-08-08 | 1 | -4/+4 | |
|\ \ | | | | | | | Fix typo in gmock-actions.h | |||||
| * | | Fix typo in gmock-actions.h | Hector Dearman | 2017-06-19 | 1 | -4/+4 | |
| | | | | | | | | | | | | This upstreams a Google-internal change (141765019). | |||||
* | | | Fixed misspelling in assertion message. | Hector Dearman | 2017-06-19 | 1 | -1/+1 | |
|/ / | | | | | | | This upstreams a Google-internal change (146491438). | |||||
* / | Use std::string and ::string explicitly in gtest and gmock code. | Nico Weber | 2017-05-15 | 3 | -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 library | Mark Mentovai | 2015-10-12 | 1 | -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/ subdir | Billy Donahue | 2015-08-25 | 23 | -0/+17082 | |