Gennadiy Civil
f906f8446e
Merging gMock, 2
2018-04-05 16:09:17 -04:00
Gennadiy Civil
2c7d681681
formatting
2018-04-05 14:41:16 -04:00
Gennadiy Civil
72faea54fd
And more MCVS warnings
2018-04-05 14:24:12 -04:00
Gennadiy Civil
a777f64f67
fixing MCVS warn
2018-04-05 14:00:14 -04:00
Gennadiy Civil
87494ebad5
Have to wait for this one
2018-04-05 11:59:59 -04:00
Gennadiy Civil
22aa2e3632
Have to wait for this one
2018-04-05 11:55:25 -04:00
Gennadiy Civil
0e34a61d3b
Merging matchers test
2018-04-05 11:35:20 -04:00
Gennadiy Civil
cef7e53700
Merging matchers test
2018-04-05 11:34:19 -04:00
Gennadiy Civil
ea3f268c4f
bad cut/paste
2018-04-04 15:46:04 -04:00
Gennadiy Civil
2c88d98934
More on MSVC warning C4503, decorated name length exceeded
2018-04-04 15:44:27 -04:00
Gennadiy Civil
3e9b148bc1
More on MSVC warning C4503, decorated name length exceeded
2018-04-04 15:29:05 -04:00
Gennadiy Civil
cfccfa9ca2
Address MSVC warning C4503, decorated name length exceeded, name was truncated
2018-04-04 15:07:52 -04:00
Gennadiy Civil
0452f1fbff
Fixing build break on MSVC
2018-04-04 14:48:06 -04:00
Gennadiy Civil
bd0ae14317
merging gmock matchers 1
2018-04-04 14:05:00 -04:00
Gennadiy Civil
7c7ab001c1
merging gmock-matchers.h 3
2018-03-26 10:36:26 -04:00
Gennadiy Civil
0eff246cb1
merging gmock-matchers.h 2
2018-03-26 10:16:59 -04:00
Gennadiy Civil
20d30a8614
Upstreaming FloatingEq2Matcher,
2018-03-26 09:28:16 -04:00
Gennadiy Civil
401b056442
Merging gmock-matchers.h -2
2018-03-23 11:42:41 -04:00
Gennadiy Civil
c4727169c2
gmock-matchers merging -2
2018-03-23 11:23:54 -04:00
Gennadiy Civil
7b1726ef5c
merging, gmock -1
2018-03-22 15:35:37 -04:00
Gennadiy Civil
92be48af66
More merges, removing old dead code
2018-03-13 11:13:37 -04:00
Gennadiy Civil
ffd5d36f59
merges-2
2018-03-05 13:28:13 -05:00
Gennadiy Civil
0a27876dd3
Merge branch 'master' of https://github.com/google/googletest
2018-03-05 12:26:24 -05:00
Gennadiy Civil
78797f38ef
Merges-1
2018-03-05 12:26:15 -05:00
Gennadiy Civil
6e32061e10
Merge branch 'master' into unsigned-wchar
2018-03-01 11:18:17 -05:00
Xiaoyi Zhang
5ed069a8fd
Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher
2018-02-27 16:06:07 -05:00
Xiaoyi Zhang
94075ff9c0
Merge branch 'master' into variant_matcher
2018-02-27 16:03:36 -05:00
Xiaoyi Zhang
250d4e8066
Add documentation for VariantWith.
2018-02-27 16:00:42 -05:00
Gennadiy Civil
bcc0a1afa1
gmock merging -2
2018-02-27 13:51:09 -05:00
Xiaoyi Zhang
fe8a4bec1b
Add matcher for std::variant.
2018-02-27 11:36:21 -05:00
Scott Graham
7c60f81b22
Try to handle unsigned wchar_t (arm) a bit better
2018-02-23 12:28:09 -08:00
Gennadiy Civil
d40efb1166
moving JoinAsTuple to internal
2018-02-12 16:42:12 -05:00
Gennadiy Civil
521a3dcbfe
Merge pull request #1446 from tholsapp/master
...
Fixed typos
2018-02-09 11:34:26 -05:00
Gennadiy Civil
1fb2e10cfe
merges
2018-02-09 10:41:09 -05:00
Troy Holsapple
a2866dfdf5
Fixed typos
2018-02-07 22:06:00 -08:00
Gennadiy Civil
8a3cd4124e
Adding tests to googlemock bazel
2018-01-26 16:30:57 -05:00
Gennadiy Civil
05c81235a1
Code merges
2018-01-26 11:57:58 -05:00
Gennadiy Civil
7b54e1227c
Merge branch 'master' into fix-core-dump-shared
2018-01-09 00:22:32 -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
9c7e25968e
Merge branch 'master' into missing-declarations
2018-01-04 22:01:38 -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
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
bc5eddec4c
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-22 14:47:25 -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
531d5ef77a
remove extra line
2017-12-11 12:21:35 -05:00
Bryan Zimmerman
4136c40a6f
remove implicit casts
2017-12-11 12:19:56 -05:00
