summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1042 from danilcha/patch-1Gennadiy Civil2017-08-031-3/+36
|\ | | | | Added description of how to silence clang pedantic warnings in Google Mock includes
| * Again rewrote everythingrefs/pull/1042/headdanilcha2017-03-121-12/+24
| |
| * Added explicit gtest library dependencydanilcha2017-03-121-1/+1
| |
| * Update README.mddanilcha2017-03-111-2/+2
| |
| * Update README.mddanilcha2017-03-111-3/+24
| |
* | Merge pull request #1170 from Manozco/1169_fix_old_cmake_issueGennadiy Civil2017-08-031-1/+4
|\ \ | | | | | | Fix policy issue with old cmakes
| * | Fix policy issue with old cmakesrefs/pull/1170/headManuel VIVES2017-08-031-1/+4
|/ / | | | | | | #1169
* | Merge pull request #867 from marzojr/patch-1Gennadiy Civil2017-08-021-2/+3
|\ \ | | | | | | Clarifying documentation language
| * | Clarifying languagerefs/pull/867/headMarzo Sette Torres Junior2016-09-021-2/+3
| | | | | | | | | The old language might mislead someone into thinking that the access level on the base class itself was changed.
* | | Merge pull request #671 from mehagar/patch-1Gennadiy Civil2017-08-021-1/+1
|\ \ \ | | | | | | | | Fix typo in AdvancedGuide.md
| * | | Fix typo in AdvancedGuide.mdrefs/pull/671/headmehagar2015-12-291-1/+1
| | | |
* | | | Merge pull request #782 from Manozco/709-cmake-policy-project-versionGennadiy Civil2017-08-021-0/+1
|\ \ \ \ | | | | | | | | | | Issue 709: Fix Cmake policy 0048
| * | | | Issue 709: Fix Cmake policy 0048refs/pull/782/headManuel Vives2016-05-221-0/+1
| | | | |
* | | | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-0212-12/+12
|\ \ \ \ \ | | | | | | | | | | | | remove duplicated words
| * | | | | remove duplicated wordsrefs/pull/764/headLi Peng2016-04-2712-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
* | | | | | Merge pull request #962 from klimkin/klimkin-patch-typoGennadiy Civil2017-08-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix a typo
| * | | | | | Fix a typorefs/pull/962/headAlexey Klimkin2016-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | Help says "FILE_PATH defaults to test_details.xml", but the real path is test_detail.xml.
* | | | | | | Merge pull request #998 from dawikur/patch-1Gennadiy Civil2017-08-021-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Replace html entities with their equivalents
| * | | | | | | Replace html entities with their equivalentsrefs/pull/998/headDawid Kurek2017-02-061-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #968 from nicolacavallini/link_typed_test_docsGennadiy Civil2017-08-021-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | added link to sample 6 in the documentation of typed test
| * | | | | | | | added link to sample 6 in the documentation of typed testrefs/pull/968/headnicolacavallini2016-12-231-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #1147 from pbos/gtest_parallel_linkGennadiy Civil2017-08-011-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add gtest-parallel to open-source projects.
| * | | | | | | | | Add gtest-parallel to open-source projects.refs/pull/1147/headPeter Boström2017-07-111-0/+3
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1167 from krizalys/fix-typoGennadiy Civil2017-07-311-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed typo
| * | | | | | | | | | Fixed typorefs/pull/1167/headChristophe Vidal2017-07-311-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1165 from aninf-wo/hethi/fix-doc-linksGennadiy Civil2017-07-313-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | fix links to Google C++ Style Guide
| * | | | | | | | | | fix links to Google C++ Style Guiderefs/pull/1165/headHerbert Thielen2017-07-303-4/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1137 from coryan/masterGennadiy Civil2017-07-264-29/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix table formatting.
| * | | | | | | | | | More tables that did not render correctly.refs/pull/1137/headCarlos O'Ryan2017-07-024-1/+9
| | | | | | | | | | |
| * | | | | | | | | | Remove silly claim that C++ lacks lambdas.Carlos O'Ryan2017-07-014-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'Ryan2017-07-011-4/+5
| | | | | | | | | | |
| * | | | | | | | | | Fix typos too s/destoyed/destroyed/Carlos O'Ryan2017-07-013-6/+6
| | | | | | | | | | |
| * | | | | | | | | | Fix table formatting.Carlos O'Ryan2017-07-013-6/+9
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The markdown was not working for a small table, fixed.
* | | | | | | | | | Merge pull request #1107 from lipk/patch-1Gennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Minor grammar fix in docs.
| * | | | | | | | | | Remove unnecessary 'the'.refs/pull/1107/headlipk2017-05-301-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1158 from junr03/fix-linkGennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | docs: fix broken link
| * | | | | | | | | | | docs: fix broken linkrefs/pull/1158/headJose Nino2017-07-261-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1143 from nyibbang/patch-1Gennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes a typo in FAQ.md
| * | | | | | | | | | | Fixes a typo in FAQ.mdrefs/pull/1143/headVincent Palancher2017-07-051-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1126 from junr03/fix-broken-linkGennadiy Civil2017-07-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | docs: fix broken link from dummies guide to cook book
| * | | | | | | | | | docs: fix broken link from dummies guide to cook bookrefs/pull/1126/headJose Nino2017-06-191-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1081 from krytarowski/netbsd-1Billy Donahue2017-06-232-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add NetBSD support
| * | | | | | | | | | | Add NetBSD supportrefs/pull/1081/headKamil Rytarowski2017-05-062-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/masterBilly Donahue2017-06-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Colouring in help text
| * | | | | | | | | | | Colouring in help textrefs/pull/1129/headChris-Sharpe2017-06-211-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Create gtest-internal.hBilly Donahue2017-06-111-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1113 from jorgehb/patch-1Billy Donahue2017-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Fixing float comparison broken link
| * | | | | | | | | | Fixing float comparison broken linkrefs/pull/1113/headjorgehb2017-06-081-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | Updating the link with a valid one. The old one was considered obsolete by the publisher.
* | | | | | | | | | Merge pull request #1091 from nico/wmicroBilly Donahue2017-05-231-38/+51
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
| * | | | | | | | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.refs/pull/1091/headNico Weber2017-05-151-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.