Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added Copyright | misterg | 2017-08-10 | 4 | -13/+129 |
| | |||||
* | Initial Revision, review 164634031 | misterg | 2017-08-10 | 4 | -29/+3 |
| | |||||
* | WIP | misterg | 2017-08-09 | 2 | -10/+32 |
| | |||||
* | Added googlemock tests | misterg | 2017-08-09 | 1 | -4/+0 |
| | |||||
* | Added googlemock tests | misterg | 2017-08-09 | 1 | -0/+29 |
| | |||||
* | WIP | misterg | 2017-08-09 | 2 | -98/+12 |
| | |||||
* | WIP, win testing | misterg | 2017-08-08 | 1 | -4/+7 |
| | |||||
* | WIP, win testing | misterg | 2017-08-08 | 1 | -3/+3 |
| | |||||
* | WIP, windows testing | misterg | 2017-08-08 | 1 | -2/+2 |
| | |||||
* | WIP, windows testing | misterg | 2017-08-08 | 1 | -2/+2 |
| | |||||
* | WIP, windows testing | misterg | 2017-08-08 | 1 | -3/+9 |
| | |||||
* | WIP | misterg | 2017-08-08 | 2 | -142/+193 |
| | |||||
* | Samples changes upstreaming | misterg | 2017-08-07 | 2 | -2/+2 |
| | |||||
* | Samples changes upstreaming | misterg | 2017-08-07 | 9 | -18/+15 |
| | |||||
* | WIP | misterg | 2017-08-02 | 1 | -36/+20 |
| | |||||
* | WIP | misterg | 2017-08-02 | 1 | -23/+15 |
| | |||||
* | WIP | misterg | 2017-08-01 | 2 | -8/+13 |
| | |||||
* | WIP | misterg | 2017-08-01 | 13 | -28/+326 |
| | |||||
* | Merge pull request #1167 from krizalys/fix-typo | Gennadiy Civil | 2017-07-31 | 1 | -1/+1 |
|\ | | | | | Fixed typo | ||||
| * | Fixed typo | Christophe Vidal | 2017-07-31 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1165 from aninf-wo/hethi/fix-doc-links | Gennadiy Civil | 2017-07-31 | 3 | -4/+4 |
|\ \ | |/ |/| | fix links to Google C++ Style Guide | ||||
| * | fix links to Google C++ Style Guide | Herbert Thielen | 2017-07-30 | 3 | -4/+4 |
|/ | |||||
* | Merge pull request #1137 from coryan/master | Gennadiy Civil | 2017-07-26 | 4 | -29/+41 |
|\ | | | | | Fix table formatting. | ||||
| * | More tables that did not render correctly. | Carlos O'Ryan | 2017-07-01 | 4 | -1/+9 |
| | | |||||
| * | Remove silly claim that C++ lacks lambdas. | Carlos O'Ryan | 2017-07-01 | 4 | -12/+12 |
| | | | | | | | | | | | | The document itself uses lambdas later, all the scaffolding to work around lack of lambdas should be considered for removal, but that is much larger an effort than I can commit to. | ||||
| * | Same fixes for "current" version. | Carlos O'Ryan | 2017-07-01 | 1 | -4/+5 |
| | | |||||
| * | Fix typos too s/destoyed/destroyed/ | Carlos O'Ryan | 2017-07-01 | 3 | -6/+6 |
| | | |||||
| * | Fix table formatting. | Carlos O'Ryan | 2017-07-01 | 3 | -6/+9 |
| | | | | | | | | The markdown was not working for a small table, fixed. | ||||
* | | Merge pull request #1107 from lipk/patch-1 | Gennadiy Civil | 2017-07-26 | 1 | -1/+1 |
|\ \ | | | | | | | Minor grammar fix in docs. | ||||
| * | | Remove unnecessary 'the'. | lipk | 2017-05-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1158 from junr03/fix-link | Gennadiy Civil | 2017-07-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | docs: fix broken link | ||||
| * | | | docs: fix broken link | Jose Nino | 2017-07-26 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1143 from nyibbang/patch-1 | Gennadiy Civil | 2017-07-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixes a typo in FAQ.md | ||||
| * | | | Fixes a typo in FAQ.md | Vincent Palancher | 2017-07-05 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1126 from junr03/fix-broken-link | Gennadiy Civil | 2017-07-26 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | docs: fix broken link from dummies guide to cook book | ||||
| * | | docs: fix broken link from dummies guide to cook book | Jose Nino | 2017-06-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1081 from krytarowski/netbsd-1 | Billy Donahue | 2017-06-23 | 2 | -2/+5 |
|\ \ \ | | | | | | | | | Add NetBSD support | ||||
| * | | | Add NetBSD support | Kamil Rytarowski | 2017-05-06 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | NetBSD is a modern UNIX-like Operating System. Enable GTEST_HAS_PTHREAD and GTEST_HAS_DEATH_TEST on NetBSD. | ||||
* | | | | Merge pull request #1129 from Chris-Sharpe/master | Billy Donahue | 2017-06-23 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Colouring in help text | ||||
| * | | | Colouring in help text | Chris-Sharpe | 2017-06-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | Create gtest-internal.h | Billy Donahue | 2017-06-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1113 from jorgehb/patch-1 | Billy Donahue | 2017-06-11 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fixing float comparison broken link | ||||
| * | | Fixing float comparison broken link | jorgehb | 2017-06-08 | 1 | -1/+1 |
|/ / | | | | | Updating the link with a valid one. The old one was considered obsolete by the publisher. | ||||
* | | Merge pull request #1091 from nico/wmicro | Billy Donahue | 2017-05-23 | 1 | -38/+51 |
|\ \ | | | | | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows. | ||||
| * | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows. | Nico Weber | 2017-05-15 | 1 | -38/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This upstreams a Google-internal change. Original CL description: The C++ standard says that function pointers are not implicitly convertible to object pointers. Visual Studio disregards that and allows implicit conversion between function pointers and object points, and enough code relies on this that clang follows suit in Microsoft-compatibility mode. However, clang emits a -Wmicrosoft-cast warning when such a conversion is done: E:\b\c\b\win_clang\src\sandbox\win\src\sync_dispatcher.cc(42,7): warning: implicit conversion between pointer-to-function and pointer-to-object is a Microsoft extension [-Wmicrosoft-cast] This change fixes this warning in gtest, while hopefully not changing any behavior. The change does two things: 1. It replaces the if in DefaultPrintTo with SFINAE 2. In C++11 mode, it uses enable_if<is_function<>> instead of ImplicitlyConvertible<T*, const void*> to check if the explicit cast is needed. With this change, functions will use the branch with the reintpret_casts with Visual Studio and clang/win, and clang no longer needs to warn that it implicitly converts a function pointer to a void pointer. | ||||
* | | | Merge pull request #1096 from gennadiycivil/add-ability-for-custom-temdir-1093 | Billy Donahue | 2017-05-18 | 2 | -1/+7 |
|\ \ \ | | | | | | | | | Changes add ability to overwrite TempDir(), issue https://github.com/… | ||||
| * | | | Changes add ability to overwrite TempDir(), issue ↵ | Gennadiy Civil | 2017-05-18 | 2 | -1/+7 |
|/ / / | | | | | | | | | | https://github.com/google/googletest/issues/1093 | ||||
* | | | Merge pull request #1089 from nico/stdstring | Billy Donahue | 2017-05-16 | 27 | -490/+488 |
|\ \ \ | | | | | | | | | Use std::string and ::string explicitly in gtest and gmock code. | ||||
| * | | | Use std::string and ::string explicitly in gtest and gmock code. | Nico Weber | 2017-05-15 | 27 | -490/+488 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge pull request #1090 from nico/typo | Billy Donahue | 2017-05-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixing typo in documentation. |