| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2018-01-03 | 9 | -33/+203 |
| |\ | | | | | Run autoconf from top-level directory. | ||||
| | * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2018-01-03 | 2 | -8/+3 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #1374 from davidben/tuple-msvc | Gennadiy Civil | 2018-01-03 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix testing::Combine on MSVC 2017. | ||||
| | * \ | Merge branch 'master' into tuple-msvc | Gennadiy Civil | 2018-01-03 | 1 | -2/+6 |
| | |\ \ | |||||
| | * | | | Fix testing::Combine on MSVC 2017. | David Benjamin | 2018-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On platforms with std::tuple and not std::tr1::tuple, GTEST_HAS_COMBINE gets turned off when it works fine (due to GTEST_TUPLE_NAMESPACE_). Elsewhere in the project, several GTEST_HAS_TR1_TUPLE checks additionally check GTEST_HAS_STD_TUPLE_, so use that formulation. (The ones that don't are specific to std::tr1::tuple and are followed by an identical GTEST_HAS_STD_TUPLE_ version underneath it.) In particular, this fixes testing::Combine on MSVC 2017, which regressed here: https://github.com/google/googletest/pull/1348#issuecomment-353879010 | ||||
| * | | | | Merge pull request #991 from davidben/uintptr | Gennadiy Civil | 2018-01-03 | 1 | -7/+2 |
| |\ \ \ \ | |_|/ / |/| | | | Pass MSVC's C4826 warning. | ||||
| | * | | | Merge branch 'master' into uintptr | Gennadiy Civil | 2018-01-02 | 177 | -28909/+4138 |
| | |\| | | |||||
| | * | | | Pass MSVC's C4826 warning. | David Benjamin | 2017-08-07 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC has an optional warning which flags when 32-bit pointers get cast into a 64-bit value. This is a little overaggressive I think, but to ease compiling in projects with aggressive warnings, fix this by just casting to const void * directly. Modern GCCs seem to compile it just fine. | ||||
| | | | * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2018-01-03 | 2 | -2/+10 |
| | | | |\ | |_|_|/ |/| | | | |||||
| * | | | | Merge pull request #1376 from gennadiycivil/master | Samuel Benzaquen | 2018-01-03 | 1 | -2/+6 |
| |\ \ \ \ | |_|/ / |/| | | | OSS Sync, cl 163329677 | ||||
| | * | | | OSS Sync, cl 163329677 | misterg | 2018-01-02 | 1 | -2/+6 |
| |/ / / | |||||
| * | | | Merge pull request #1109 from davidben/vs2017 | Gennadiy Civil | 2018-01-02 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | Avoid warning C4619 in MSVC 2017. | ||||
| | * | | | Avoid warning C4619 in MSVC 2017. | David Benjamin | 2017-12-25 | 1 | -0/+4 |
| |/ / / | | | | | | | | | | | | | C4800 has since been removed in MSVC 2017, so trying to silence it throws warning C4619 when enabled. | ||||
| | | * | Build both googletest and googlemock. | Carlos O'Ryan | 2017-12-24 | 1 | -2/+0 |
| | | | | |||||
| | | * | Create a autotools-based build for Travis. | Carlos O'Ryan | 2017-12-24 | 4 | -2/+99 |
| | | | | | | | | | | | | | When this build works, we know the autoconf support is working. | ||||
| | | * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-22 | 3 | -15/+13 |
| | | |\ | |_|/ |/| | | |||||
| * | | | Merge pull request #778 from gpakosz/C4389 | Gennadiy Civil | 2017-12-21 | 1 | -2/+0 |
| |\ \ \ | | | | | | | | | Re-enable MSVC++ C4389 warning in CmdHelperEq() | ||||
| | * | | | Re-enable MSVC++ C4389 warning in CmdHelperEq() | Gregory Pakosz | 2017-12-21 | 1 | -2/+0 |
| |/ / / | | | | | | | | | | | | | C4389 was inhibited in commit 4b83461 making behavior inconsistent with other compilers. | ||||
| * | | | Merge pull request #1357 from bryanzim/master | Gennadiy Civil | 2017-12-20 | 2 | -13/+13 |
| |\ \ \ | | | | | | | | | CMake fixes for paths with spaces | ||||
| | * | | | Update internal_utils.cmake | bryanzim | 2017-12-20 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into master | bryanzim | 2017-12-20 | 17 | -115/+7 |
| | |\ \ \ | |/ / / |/| | | | |||||
| | * | | | Merge branch 'master' into master | bryanzim | 2017-12-15 | 9 | -360/+193 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into master | bryanzim | 2017-12-11 | 8 | -29/+309 |
| | |\ \ \ \ | |||||
| | * | | | | | remove extra line | Bryan Zimmerman | 2017-12-11 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | remove implicit casts | Bryan Zimmerman | 2017-12-11 | 4 | -10/+8 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into master | bryanzim | 2017-12-11 | 2 | -4/+4 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into master | bryanzim | 2017-12-08 | 1 | -0/+2 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into master | bryanzim | 2017-12-08 | 4 | -5/+7 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into master | bryanzim | 2017-12-06 | 2 | -4/+7 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | replaced back accidently removed static_cast with consistent ImplicitCast_ | Bryan Zimmerman | 2017-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into master | bryanzim | 2017-10-30 | 2 | -4/+12 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | fix for VS2017 deprecation of ::tr1::tuple | Bryan Zimmerman | 2017-10-27 | 6 | -22/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces | ||||
| | | | | | | | | | | * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-19 | 17 | -115/+7 |
| | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1248 from ↵ | Gennadiy Civil | 2017-12-19 | 16 | -112/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS remove GTEST_HAS_PARAM_TESTS | ||||
| | * | | | | | | | | | | | Update gtest-param-test.h.pump | Gennadiy Civil | 2017-12-19 | 1 | -3/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Update gtest-param-test.h.pump | Gennadiy Civil | 2017-12-19 | 1 | -0/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-18 | 17 | -389/+502 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-09 | 6 | -6/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-01 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-11-07 | 14 | -47/+136 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-10-04 | 20 | -22/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-24 | 10 | -163/+193 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-08 | 6 | -11/+42 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | remove GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-04 | 16 | -112/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in issue #360: "Now that all the platforms gtest supports work with value-parameterized tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from the codebase everywhere." https://github.com/google/googletest/issues/360 | ||||
| * | | | | | | | | | | | | | | | | Merge pull request #1212 from qzmfranklin/bazel | Gennadiy Civil | 2017-12-19 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | Also build when included in source. | ||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into bazel | Gennadiy Civil | 2017-12-18 | 108 | -1981/+3326 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into bazel | Gennadiy Civil | 2017-08-22 | 4 | -9/+71 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bazel | Zhongming Qu | 2017-08-18 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Also can build when included in source. | Zhongming Qu | 2017-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Remove trailing whitespaces in BUILD.bazel | Zhongming Qu | 2017-08-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | |||||
 |
index : avr/qmk/googletest | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |