aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' into uintptrGennadiy Civil2018-01-02177-28909/+4138
| |\| | | | | |
| * | | | | | | Pass MSVC's C4826 warning.David Benjamin2017-08-071-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 pull request #1376 from gennadiycivil/masterSamuel Benzaquen2018-01-031-2/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | OSS Sync, cl 163329677
| * | | | | | | OSS Sync, cl 163329677misterg2018-01-021-2/+6
|/ / / / / / /
* | | | | | | Merge pull request #1109 from davidben/vs2017Gennadiy Civil2018-01-021-0/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Avoid warning C4619 in MSVC 2017.
| * | | | | | Avoid warning C4619 in MSVC 2017.David Benjamin2017-12-251-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | C4800 has since been removed in MSVC 2017, so trying to silence it throws warning C4619 when enabled.
* | | | | | Merge pull request #778 from gpakosz/C4389Gennadiy Civil2017-12-211-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Re-enable MSVC++ C4389 warning in CmdHelperEq()
| * | | | | | Re-enable MSVC++ C4389 warning in CmdHelperEq()Gregory Pakosz2017-12-211-2/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | C4389 was inhibited in commit 4b83461 making behavior inconsistent with other compilers.
* | | | | | Merge pull request #1357 from bryanzim/masterGennadiy Civil2017-12-202-13/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | CMake fixes for paths with spaces
| * | | | | Update internal_utils.cmakebryanzim2017-12-201-2/+1
| | | | | |
| * | | | | Merge branch 'master' into masterbryanzim2017-12-2017-115/+7
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1248 from ↵Gennadiy Civil2017-12-1916-112/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS remove GTEST_HAS_PARAM_TESTS
| * | | | | | Update gtest-param-test.h.pumpGennadiy 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-1817-389/+502
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-096-6/+18
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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-0714-47/+136
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-0420-22/+22
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-2410-163/+193
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-086-11/+42
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-0416-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/bazelGennadiy Civil2017-12-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Also build when included in source.
| * | | | | | | | | | | Merge branch 'master' into bazelGennadiy Civil2017-12-18108-1981/+3326
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into bazelGennadiy Civil2017-08-224-9/+71
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into bazelZhongming Qu2017-08-181-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Also can build when included in source.Zhongming Qu2017-08-181-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove trailing whitespaces in BUILD.bazelZhongming Qu2017-08-181-2/+2
| | | | | | | | | | | | | |
| | | | | | | | | | | * | | Merge branch 'master' into masterbryanzim2017-12-159-360/+193
| | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1354 from coryan/fix-top-level-licenseGennadiy Civil2017-12-159-360/+193
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add top-level LICENSE and CONTRIBUTING.md files [skip ci]
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-top-level-license' of github.com:coryan/googletest into ↵Carlos O'Ryan2017-12-1110-33/+313
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-top-level-license
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-top-level-licenseGennadiy Civil2017-12-1110-33/+313
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-118-364/+132
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the review comments.
| * | | | | | | | | | | | | | Also add documentation around becoming a contributor.Carlos O'Ryan2017-12-081-0/+37
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Wrong LICENSE file, sorry. Corrected. [skip ci]Carlos O'Ryan2017-12-081-201/+28
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add Apache-2.0 LICENSE file.Carlos O'Ryan2017-12-081-0/+201
| | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | Merge branch 'master' into masterbryanzim2017-12-118-29/+309
| | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1355 from coryan/blaze-build-travisGennadiy Civil2017-12-118-29/+309
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | Implement bazel-based builds in Travis.
| * | | | | | | | | | | | | | Merge branch 'master' into blaze-build-travisGennadiy Civil2017-12-112-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Implement bazel-based builds in Travis.Carlos O'Ryan2017-12-088-29/+309
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactored test build scripts to enable bazel-build scripts in Travis.
| | | | | | | | | | | * | | remove extra lineBryan Zimmerman2017-12-111-1/+0
| | | | | | | | | | | | | |
| | | | | | | | | | | * | | remove implicit castsBryan Zimmerman2017-12-114-10/+8
| | | | | | | | | | | | | |
| | | | | | | | | | | * | | Merge branch 'master' into masterbryanzim2017-12-112-4/+4
| | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1333 from sam-lunt/use-system-includesGennadiy Civil2017-12-092-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Use system includes
| * | | | | | | | | | | | | Merge branch 'master' into use-system-includesGennadiy Civil2017-12-086-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into use-system-includesGennadiy Civil2017-12-011-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | make includes systemSam Lunt2017-11-272-4/+4
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | | | | | | | | | * | | Merge branch 'master' into masterbryanzim2017-12-081-0/+2
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1340 from coryan/fix-googlemock-test-build-fileGennadiy Civil2017-12-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | Add licenses() directive for googlemock/tests.
| * | | | | | | | | | | | Add licenses() directive for googlemock/tests.Carlos O'Ryan2017-12-081-0/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the directive embedding googletest into third_party breaks any //... target.