aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | cleanup, mergesGennadiy Civil2018-02-133-26/+34
| | |
* | | cleanup/mergesGennadiy Civil2018-02-132-5/+8
| | |
* | | mergingGennadiy Civil2018-02-091-2/+0
| | |
* | | mergesGennadiy Civil2018-02-091-11/+40
| | |
* | | Merge branch 'master' into assertGennadiy Civil2018-02-092-14/+15
|\ \ \
| * \ \ Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-091-1/+1
| |\ \ \ | | | | | | | | | | Fixed typos
| | * | | Fixed typosTroy Holsapple2018-02-071-1/+1
| | | | |
| * | | | mergesGennadiy Civil2018-02-091-13/+14
| |/ / /
* / / / Add ability to throw from ASSERTAlexey Sokolov2018-02-081-1/+15
|/ / / | | | | | | | | | | | | | | | | | | while not losing benefits of EXPECT, and not killing the whole test, as with --gtest_throw_on_failure. 183822976
* | | Merges and also adding new bazel build modeGennadiy Civil2018-01-311-1/+2
| | |
* | | Code mergesGennadiy Civil2018-01-301-15/+57
| | |
* | | Ability to optionally depend on Abseil plus upstream of 183716547Gennadiy Civil2018-01-301-0/+28
|/ /
* / upstream cl 182543808Gennadiy Civil2018-01-241-0/+3
|/
* Merge branch 'master' into win-libcxxGennadiy Civil2018-01-232-4/+10
|\
| * merges, cl/155419551 and otherGennadiy Civil2018-01-221-4/+7
| |
| * Merge branch 'master' into support_xboxoneGennadiy Civil2018-01-183-72/+82
| |\
| * | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-121-0/+3
| | |
* | | Merge branch 'master' into win-libcxxGennadiy Civil2018-01-182-45/+53
|\ \ \ | | |/ | |/|
| * | Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-172-45/+53
| | |
* | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under ↵Peter Collingbourne2018-01-171-1/+1
|/ / | | | | | | | | | | | | | | libc++. If _MSC_VER is defined, it means that we are using the Microsoft ABI, so cxxabi.h (which is associated with the Itanium ABI) will not be available.
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+1
| |
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-2/+3
| |
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+0
| |
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-4/+1
| |
* | More code mergesGennadiy Civil2018-01-151-18/+15
| |
* | Code mergingGennadiy Civil2018-01-152-8/+16
| |
* | continue upstream/merge, etcGennadiy Civil2018-01-111-4/+4
|/
* Upstream cl 103120214Gennadiy Civil2018-01-112-4/+31
|
* More merge, cleanupGennadiy Civil2018-01-101-1/+1
|
* More merge, cleanupGennadiy Civil2018-01-101-2/+1
|
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
|
* revertGennadiy Civil2018-01-101-68/+9
|
* code merges, cleanupGennadiy Civil2018-01-102-11/+70
|
* code merge, cleanupsGennadiy Civil2018-01-091-1/+1
|
* Upstream of cl 129104714Gennadiy Civil2018-01-092-49/+50
|
* Revert one fileGennadiy Civil2018-01-091-2/+3
|
* wip, cleanups/mergeGennadiy Civil2018-01-092-5/+3
|
* cleanup, mergeGennadiy Civil2018-01-093-2/+4
|
* Merge branch 'master' into missing-declarationsGennadiy Civil2018-01-041-1/+1
|\
| * Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.David Benjamin2018-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang-cl is clang for Windows running in MSVC mode. Chromium uses it for Windows builds. clang-cl is weird in that it defines __clang__ and _MSC_VER, but *NOT* __GNUC__. This is vaguely analogous to how normal clang defines __clang__ (what it is) and __GNUC__ (what it is compatible with). However, clang-cl still implements most GCC extensions, being clang. Notably, the way to control -Wformat-literal is still with __attribute__((__format__)). For better error-checking and strict -Wformatl-literal compatibility (see 53c478d639b8eebd2942e88266610ebc79c541f6), define GTEST_ATTRIBUTE_PRINTF_ in clang-cl too.
* | Pass the -Wmissing-declarations warning.David Benjamin2018-01-032-9/+9
|/ | | | | | This makes it easier to use GTest in projects that build with the -Wmissing-declarations warning. This fixes the warning in headers and source files, though not GTest's own tests as it is rather noisy there.
* Merge pull request #1374 from davidben/tuple-msvcGennadiy Civil2018-01-031-1/+1
|\ | | | | Fix testing::Combine on MSVC 2017.
| * Fix testing::Combine on MSVC 2017.David Benjamin2018-01-021-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 branch 'master' into uintptrGennadiy Civil2018-01-0210-76/+76
|\|
| * 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.
| * 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.
| * 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-091-0/+3
| |\
| | * Remove C4996 warning in VS2017Wojciech Mamrak2017-12-071-0/+3
| | |