Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | fixing MCVS warn | Gennadiy Civil | 2018-04-05 | 1 | -0/+10 | |
| | | ||||||
* | | merging gmock matchers 1 | Gennadiy Civil | 2018-04-04 | 1 | -29/+169 | |
| | | ||||||
* | | merging gmock-matchers.h 3 | Gennadiy Civil | 2018-03-26 | 1 | -13/+36 | |
| | | ||||||
* | | merging gmock-matchers.h 2 | Gennadiy Civil | 2018-03-26 | 1 | -7/+44 | |
| | | ||||||
* | | Upstreaming FloatingEq2Matcher, | Gennadiy Civil | 2018-03-26 | 1 | -9/+13 | |
| | | ||||||
* | | Merging gmock-matchers.h -2 | Gennadiy Civil | 2018-03-23 | 1 | -29/+208 | |
| | | ||||||
* | | gmock-matchers merging -2 | Gennadiy Civil | 2018-03-23 | 1 | -10/+250 | |
| | | ||||||
* | | merging, gmock -1 | Gennadiy Civil | 2018-03-22 | 1 | -24/+45 | |
| | | ||||||
* | | More merges, removing old dead code | Gennadiy Civil | 2018-03-13 | 1 | -5/+6 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 1 | -0/+2 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-01 | 1 | -44/+258 | |
| |\ \ | ||||||
| * | | | Try to handle unsigned wchar_t (arm) a bit better | Scott Graham | 2018-02-23 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merges-1 | Gennadiy Civil | 2018-03-05 | 1 | -4/+3 | |
| |/ / |/| | | ||||||
* | | | Merge branch 'master' into variant_matcher | Xiaoyi Zhang | 2018-02-27 | 1 | -44/+187 | |
|\ \ \ | ||||||
| * | | | gmock merging -2 | Gennadiy Civil | 2018-02-27 | 1 | -44/+187 | |
| |/ / | ||||||
* / / | Add matcher for std::variant. | Xiaoyi Zhang | 2018-02-27 | 1 | -0/+71 | |
|/ / | ||||||
* | | moving JoinAsTuple to internal | Gennadiy Civil | 2018-02-12 | 1 | -4/+0 | |
| | | ||||||
* | | Fixed typos | Troy Holsapple | 2018-02-07 | 1 | -2/+2 | |
| | | ||||||
* | | Code merges | Gennadiy Civil | 2018-01-26 | 7 | -31/+81 | |
| | | ||||||
* | | Pass the -Wmissing-declarations warning. | David Benjamin | 2018-01-03 | 1 | -0/+4 | |
| | | | | | | | | | | | | 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. | |||||
* | | Remove gcc 6 misleading indentations. | Romain Geissler | 2017-10-25 | 2 | -13/+26 | |
| | | ||||||
* | | Use gender-neutral pronouns in comments and docs | Jonathan Wakely | 2017-09-27 | 1 | -1/+1 | |
| | | ||||||
* | | change links from former code.google.com to current github repository | Herbert Thielen | 2017-08-31 | 4 | -4/+4 | |
| | | ||||||
* | | 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 | |