summaryrefslogtreecommitdiffstats
path: root/googletest/include
Commit message (Expand)AuthorAgeFilesLines
* Remove C4996 warning in VS2017refs/pull/1348/headWojciech Mamrak2017-12-071-0/+3
* 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
|/
* Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-271-1/+1
* Merge branch 'master' into masterrefs/pull/1249/headGennadiy Civil2017-09-231-4/+0
|\
| * Revert "Allow macros inside of parametrized test names."refs/pull/1271/headGennadiy Civil2017-09-212-15/+9
| * Merge pull request #1245 from sheepmaster/2017_09_04_parametrizedGennadiy Civil2017-09-212-9/+15
| |\
| | * Allow macros inside of parametrized test names.Bernhard Bauer2017-09-042-9/+15
| * | Remove redundant declarationrefs/pull/1265/headBenjamin Kircher2017-09-161-4/+0
| |/
* | Swap reinterpret_cast for static_caststkhapugin@chromium.org2017-09-191-2/+2
* | add a castStepan Khapugin2017-09-051-1/+2
|/
* 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-093-8/+42
|/ / /
* | | 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
* | | | Merge pull request #1091 from nico/wmicroBilly Donahue2017-05-231-38/+51
|\ \ \ \
| * | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.refs/pull/1091/headNico Weber2017-05-151-38/+51
* | | | | Changes add ability to overwrite TempDir(), issue https://github.com/google/g...refs/pull/1096/headGennadiy Civil2017-05-181-0/+4
* | | | | Merge pull request #1089 from nico/stdstringBilly Donahue2017-05-164-20/+19
|\ \ \ \ \
| * | | | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-154-20/+19
| |/ / / /
* | | | | Merge pull request #1090 from nico/typoBilly Donahue2017-05-161-1/+1
|\ \ \ \ \
| * | | | | Fixing typo in documentation.refs/pull/1090/headNico Weber2017-05-151-1/+1
| |/ / / /
* | | | | Gender-neutralize comments in gtest.h.refs/pull/1092/headNico Weber2017-05-151-1/+1
|/ / / /
* | | | Merge pull request #1078 from pwnall/gtest_api_portBilly Donahue2017-05-112-1/+11
|\ \ \ \
| * | | | Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.refs/pull/1078/headVictor Costan2017-05-042-1/+11
| |/ / /
* | | | Merge pull request #965 from davidben/format-attrBilly Donahue2017-05-071-0/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Annotate ColoredPrintf with the format attribute and fix bugs.refs/pull/965/headDavid Benjamin2016-12-221-0/+17
| |/ /
* | | Merge pull request #1034 from dankegel/masterBilly Donahue2017-05-021-1/+1
|\ \ \
| * | | Minimal changes to fix build failures on Microsoft Visual Studio 2015refs/pull/1034/headDan Kegel2017-03-021-1/+1
* | | | Changes to make TempDir() publicrefs/pull/1077/headGennadiy Civil2017-05-022-3/+9
|/ / /
* | | fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/refs/pull/996/headsrz_zumix2017-02-021-1/+1
* | | Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_Prefs/pull/982/headMike Bjorge2017-01-101-3/+4
|/ /
* | Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONEBilly Donahue2016-11-031-2/+6
|\ \ | |/ |/|
| * Fix detection of GTEST_HAS_CLONE for Android.refs/pull/918/headDan Albert2016-11-011-2/+6
* | Fix build with MinGW-w64refs/pull/856/headArkadiy Shapkin2016-09-041-1/+1
* | Merge pull request #721 from ilmagico/fix-mingw-threadsBilly Donahue2016-08-241-3/+9
|\ \
| * | Fix compilation on MinGW with native threadsDaniele Tamino2016-02-221-3/+9
| |/
* | Rollback change #808.refs/pull/810/headBilly Donahue2016-06-261-2/+2
* | Fix to tests that return object which implement operator boolrefs/pull/808/headDavid Mott2016-06-251-2/+2
* | fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that imple...David Mott2016-06-251-2/+2
* | Merge pull request #724 from duggelz/masterBilly Donahue2016-03-151-2/+1
|\ \ | |/ |/|
| * Restructure $XML_OUTPUT_FILE logicDoug Greiman2016-02-261-2/+1
| * Fix inconsistent styleDoug Greiman2016-02-261-1/+1