Gennadiy Civil
ee7f9fd88e
More merge, cleanup
2018-01-10 16:49:20 -05:00
Gennadiy Civil
4695a1108e
More merge, cleanup
2018-01-10 16:45:59 -05:00
Gennadiy Civil
091c46ed6e
Code merge, upstreaming accumulated changes, cleanup
2018-01-10 14:42:29 -05:00
Gennadiy Civil
a230988e5b
revert
2018-01-10 14:00:52 -05:00
Gennadiy Civil
9fc04da090
code merges, cleanup
2018-01-10 13:58:00 -05:00
Gennadiy Civil
e7c35b2539
revert googletest/test/gtest-param-test_test.cc
2018-01-10 11:04:49 -05:00
Gennadiy Civil
28368f8f74
code merge, cleanups
2018-01-09 22:46:17 -05:00
Gennadiy Civil
9b54fda880
Upstream of cl 129104714
2018-01-09 16:41:15 -05:00
Gennadiy Civil
062f5f05b3
Revert one file
2018-01-09 15:46:44 -05:00
Gennadiy Civil
823b5a8545
wip, cleanups/merge
2018-01-09 14:48:06 -05:00
Gennadiy Civil
2a8d1eabc0
Merge branch 'master' into master
2018-01-09 14:00:25 -05:00
Gennadiy Civil
00b42ec5c3
cleanup, merge
2018-01-09 13:59:27 -05:00
Loo Rong Jie
15605813a5
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
...
and x64_windows_msvc
2018-01-09 08:29:44 +08:00
Gennadiy Civil
59c57226dc
Small cleanups, merge
2018-01-08 16:14:06 -05:00
Gennadiy Civil
40c3187116
Merge branch 'master' into master
2018-01-05 15:34:07 -05:00
Gennadiy Civil
88a9c878c2
Revert one file for now
2018-01-05 12:35:41 -05:00
Gennadiy Civil
9c7e25968e
Merge branch 'master' into missing-declarations
2018-01-04 22:01:38 -05:00
Gennadiy Civil
bf08b69717
Merge pull request #1377 from davidben/clang-cl
...
Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
2018-01-04 21:59:48 -05:00
Gennadiy Civil
a359be3711
code cleanup in preparation for merges, cl 180857299
2018-01-04 21:49:27 -05:00
Gennadiy Civil
c8518ae0cb
Merge branch 'master' into master
2018-01-04 10:13:00 -05:00
Gennadiy Civil
ce9c285a6c
upstreaming cl 124976692
2018-01-03 16:57:05 -05:00
David Benjamin
e7beafb2b1
Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
...
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.
2018-01-03 14:55:52 -05:00
David Benjamin
57561c06f0
Pass the -Wmissing-declarations warning.
...
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.
2018-01-03 14:50:22 -05:00
Gennadiy Civil
4146dcfb8d
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2018-01-03 14:15:14 -05:00
Gennadiy Civil
4c7697a958
Merge pull request #1374 from davidben/tuple-msvc
...
Fix testing::Combine on MSVC 2017.
2018-01-03 14:11:38 -05:00
Gennadiy Civil
5caedf5c38
Merge pull request #991 from davidben/uintptr
...
Pass MSVC's C4826 warning.
2018-01-03 14:10:29 -05:00
Gennadiy Civil
e6bcc9e722
Merge branch 'master' into tuple-msvc
2018-01-03 13:04:37 -05:00
Gennadiy Civil
7a649860fd
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2018-01-03 12:51:09 -05:00
misterg
0ee1e9fccd
OSS Sync, cl 163329677
2018-01-02 14:42:09 -05:00
David Benjamin
ce7f204275
Fix testing::Combine on MSVC 2017.
...
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
2018-01-02 12:57:49 -05:00
Gennadiy Civil
98024c8cfd
Merge branch 'master' into uintptr
2018-01-02 10:54:26 -05:00
David Benjamin
914dda29f4
Avoid warning C4619 in MSVC 2017.
...
C4800 has since been removed in MSVC 2017, so trying to silence it
throws warning C4619 when enabled.
2017-12-25 11:02:02 -05:00
Gennadiy Civil
bc5eddec4c
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-22 14:47:25 -05:00
Gregory Pakosz
00c2c50f88
Re-enable MSVC++ C4389 warning in CmdHelperEq()
...
C4389 was inhibited in commit 4b83461 making behavior inconsistent with
other compilers.
2017-12-21 16:35:38 +01:00
bryanzim
508b23f964
Update internal_utils.cmake
2017-12-20 10:06:20 -05:00
bryanzim
52e12448a8
Merge branch 'master' into master
2017-12-20 08:21:22 -05:00
Gennadiy Civil
afcf3a5265
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-19 13:43:22 -05:00
Gennadiy Civil
e9c19a9abb
Update gtest-param-test.h.pump
2017-12-19 10:58:37 -05:00
Gennadiy Civil
acb41a3e4a
Update gtest-param-test.h.pump
2017-12-19 10:55:49 -05:00
Gennadiy Civil
9291399ef3
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-12-18 12:02:12 -05:00
bryanzim
0e0dc8cdfb
Merge branch 'master' into master
2017-12-15 16:52:50 -05:00
Gennadiy Civil
4f3a212568
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-15 15:49:46 -05:00
Carlos O'Ryan
414af0e8a5
Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license
2017-12-11 19:34:19 -05:00
Carlos O'Ryan
3c218ff29c
Refactor docs about contributions to CONTRIBUTING.md.
...
Per the review comments.
2017-12-11 19:33:27 -05:00
Bryan Zimmerman
4136c40a6f
remove implicit casts
2017-12-11 12:19:56 -05:00
bryanzim
0fb3f4c80b
Merge branch 'master' into master
2017-12-11 09:37:55 -05:00
Gennadiy Civil
000582a49b
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-12-09 09:41:02 -05:00
Gennadiy Civil
7b956df687
Merge branch 'master' into use-system-includes
2017-12-08 15:11:13 -05:00
Gennadiy Civil
d70b7007c1
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-08 11:56:41 -05:00
bryanzim
5845063480
Merge branch 'master' into master
2017-12-08 11:31:31 -05:00
