summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/internal
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #1423 from pcc/win-libcxx2Gennadiy Civil2018-02-271-2/+5
|\ \
| * \ Merge branch 'master' into win-libcxx2refs/pull/1423/headGennadiy Civil2018-02-272-49/+85
| |\ \
| * | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.Peter Collingbourne2018-01-251-2/+5
| | |/ | |/|
* | | Switch default death test style back to "fast".refs/pull/1464/headVictor Costan2018-02-271-0/+10
| |/ |/|
* | Removed trailing comma in enumAnders Sundman (asum)2018-02-231-1/+1
* | cleanup, mergesGennadiy Civil2018-02-133-26/+34
* | mergingrefs/pull/1449/headGennadiy Civil2018-02-091-2/+0
* | mergesGennadiy Civil2018-02-091-11/+40
* | Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-091-1/+1
|\ \
| * | Fixed typosrefs/pull/1446/headTroy Holsapple2018-02-081-1/+1
| |/
* | mergesrefs/pull/1448/headGennadiy Civil2018-02-091-13/+14
|/
* Merge branch 'master' into win-libcxxrefs/pull/1410/headGennadiy Civil2018-01-231-0/+3
|\
| * Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-181-47/+4
| |\
| * | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-121-0/+3
* | | Merge branch 'master' into win-libcxxGennadiy Civil2018-01-181-43/+0
|\ \ \ | | |/ | |/|
| * | Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-171-43/+0
* | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under l...Peter Collingbourne2018-01-181-1/+1
|/ /
* | continue upstream/merge, etcrefs/pull/1400/headGennadiy Civil2018-01-111-4/+4
|/
* Upstream cl 103120214Gennadiy Civil2018-01-111-3/+25
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-102-37/+37
* revertrefs/pull/1396/headGennadiy Civil2018-01-101-68/+9
* code merges, cleanupGennadiy Civil2018-01-102-11/+70
* Upstream of cl 129104714refs/pull/1394/headGennadiy Civil2018-01-091-47/+0
* wip, cleanups/mergeGennadiy Civil2018-01-091-2/+1
* cleanup, mergeGennadiy Civil2018-01-093-2/+4
* Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.refs/pull/1377/headDavid Benjamin2018-01-031-1/+1
* Fix testing::Combine on MSVC 2017.David Benjamin2018-01-021-1/+1
* Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-091-0/+3
|\
| * Remove C4996 warning in VS2017refs/pull/1348/headWojciech Mamrak2017-12-071-0/+3
* | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-11-071-5/+10
|\ \ | |/
| * Merge branch 'master' into gtestapifixrefs/pull/1304/headm-gupta2017-10-251-3/+8
| |\
| | * Enable C++11 features for VS2015 and VS2017Arkadiy Shapkin2017-10-251-3/+8
| * | googletest: Add GTEST_API_ attribute to ThreadLocal class.Manoj Gupta2017-10-201-2/+2
| |/
* | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-041-1/+1
|\ \ | |/
| * Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-271-1/+1
* | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-241-4/+0
|\ \ | |/
| * Remove redundant declarationrefs/pull/1265/headBenjamin Kircher2017-09-161-4/+0
* | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-044-32/+4
|/
* Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIAScott Graham2017-08-292-2/+6
* Merge branch 'master' into masterDaniel Krügler2017-08-211-3/+4
|\
| * Merge pull request #905 from iignatev/masterGennadiy Civil2017-08-141-2/+3
| |\
| | * enable null detection on Solaris Studio 12u4+refs/pull/905/headiignatev2016-10-171-2/+3
| * | Merge pull request #937 from srz-zumix/fix-gtest-port-typoGennadiy Civil2017-08-111-1/+1
| |\ \
| | * | Fix or condition typo ( '|' -> '||' )refs/pull/937/headsrz_zumix2016-11-111-1/+1
* | | | Infinite Loop when calling a mock function that takes boost::filesystem::path...drgler2017-08-092-0/+31
|/ / /
* | | Merge pull request #1081 from krytarowski/netbsd-1Billy Donahue2017-06-232-2/+5
|\ \ \
| * | | Add NetBSD supportrefs/pull/1081/headKamil Rytarowski2017-05-062-2/+5
* | | | Create gtest-internal.hBilly Donahue2017-06-111-1/+1
* | | | Changes add ability to overwrite TempDir(), issue https://github.com/google/g...refs/pull/1096/headGennadiy Civil2017-05-181-0/+4
* | | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-152-12/+12