summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* Pass the -Wmissing-declarations warning.David Benjamin2018-01-035-42/+50
* Merge pull request #1374 from davidben/tuple-msvcGennadiy Civil2018-01-031-1/+1
|\
| * Merge branch 'master' into tuple-msvcrefs/pull/1374/headGennadiy Civil2018-01-031-2/+6
| |\
| * | Fix testing::Combine on MSVC 2017.David Benjamin2018-01-021-1/+1
* | | Merge pull request #991 from davidben/uintptrGennadiy Civil2018-01-031-7/+2
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into uintptrrefs/pull/991/headGennadiy Civil2018-01-02104-13642/+2499
| |\ \ | | |/
| * | Pass MSVC's C4826 warning.David Benjamin2017-08-071-7/+2
* | | OSS Sync, cl 163329677refs/pull/1376/headmisterg2018-01-021-2/+6
| |/ |/|
* | Avoid warning C4619 in MSVC 2017.refs/pull/1109/headDavid Benjamin2017-12-251-0/+4
* | Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/headGregory Pakosz2017-12-211-2/+0
* | Update internal_utils.cmakerefs/pull/1357/headbryanzim2017-12-201-2/+1
* | Merge branch 'master' into masterbryanzim2017-12-2016-112/+4
|\ \
| * | Update gtest-param-test.h.pumprefs/pull/1248/headGennadiy Civil2017-12-191-3/+0
| * | Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-0/+3
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-183-166/+1
| |\ \
| * \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-093-3/+11
| |\ \ \
| * \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-011-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-11-076-25/+73
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-0412-13/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-248-153/+175
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-083-6/+11
| |\ \ \ \ \ \ \ \
| * | | | | | | | | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-0416-112/+4
* | | | | | | | | | Merge branch 'master' into masterbryanzim2017-12-153-166/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix...refs/pull/1354/headCarlos O'Ryan2017-12-121-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-123-166/+1
* | | | | | | | | | remove implicit castsBryan Zimmerman2017-12-113-5/+4
* | | | | | | | | | Merge branch 'master' into masterrefs/pull/1311/headbryanzim2017-12-111-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' into use-system-includesrefs/pull/1333/headGennadiy Civil2017-12-083-1/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Merge branch 'master' into use-system-includesGennadiy Civil2017-12-011-3/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | make includes systemSam Lunt2017-11-271-2/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into masterbryanzim2017-12-082-3/+4
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Remove C4996 warning in VS2017refs/pull/1348/headWojciech Mamrak2017-12-071-0/+3
| * | | | | | | | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
* | | | | | | | | Merge branch 'master' into masterbryanzim2017-12-062-4/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' into masterrefs/pull/1225/headGennadiy Civil2017-12-0128-230/+321
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fixes issue #826 by treating MinGW as "non-Windows" when determining colored ...refs/pull/1324/headwhame2017-11-071-3/+3
| | |/ / / / / /
| * | | | | | | Speed up printing of characters which need hex escapingBrian Silverman2017-08-281-1/+4
* | | | | | | | replaced back accidently removed static_cast with consistent ImplicitCast_Bryan Zimmerman2017-11-221-1/+1
* | | | | | | | Merge branch 'master' into masterbryanzim2017-10-301-4/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | remove markdown stars (bold) from code examplesrefs/pull/1313/headHerbert Thielen2017-10-291-4/+4
* | | | | | | | fix for VS2017 deprecation of ::tr1::tupleBryan Zimmerman2017-10-274-13/+19
|/ / / / / / /
* | | | | | | Merge branch 'master' into gtestapifixrefs/pull/1304/headm-gupta2017-10-255-19/+56
|\ \ \ \ \ \ \
| * | | | | | | Fix tests with VS2015 and VS2017Arkadiy Shapkin2017-10-253-15/+46
| * | | | | | | Enable C++11 features for VS2015 and VS2017Arkadiy Shapkin2017-10-251-3/+8
| * | | | | | | Merge branch 'master' into masterrefs/pull/1139/headGennadiy Civil2017-10-2024-196/+242
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into masterChe-Hsun Liu2017-08-3142-1239/+1927
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into masterChe-Hsun Liu2017-08-1452-11923/+272
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update googletest README.mdChe-Hsun Liu2017-07-021-1/+2
* | | | | | | | | | | googletest: Add GTEST_API_ attribute to ThreadLocal class.Manoj Gupta2017-10-201-2/+2
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Updated README with information about C runtime dynamic/static linking issues...refs/pull/1288/headJoe Alam2017-10-071-0/+11
| |_|_|_|_|_|_|/ / |/| | | | | | | |