Gennadiy Civil
fed44cc0c2
merging
2018-04-10 16:22:50 -04:00
Gennadiy Civil
346f1f5734
merge
2018-04-10 16:10:34 -04:00
Gennadiy Civil
ec1df5b40f
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
2018-04-10 15:57:16 -04:00
Gennadiy Civil
3f59eb6a59
Revert "gmock actions 2"
2018-04-09 22:10:12 -04:00
Gennadiy Civil
ca798e29e1
... and this
2018-04-09 16:24:30 -04:00
Gennadiy Civil
d1a6cb501e
formatting
2018-04-09 15:50:19 -04:00
Gennadiy Civil
9d1fb0287a
tuning
2018-04-09 15:39:12 -04:00
Gennadiy Civil
2df7aec89a
tuning
2018-04-09 15:38:38 -04:00
Gennadiy Civil
781a196953
cont
2018-04-09 15:23:00 -04:00
Gennadiy Civil
6d43c5d6dd
msvc
2018-04-09 13:51:01 -04:00
Gennadiy Civil
2852279601
more msvc
2018-04-09 12:03:40 -04:00
Gennadiy Civil
7ca71c7766
msvc 14
2018-04-09 11:48:02 -04:00
Gennadiy Civil
96af90153f
testing msvc again
2018-04-09 11:35:01 -04:00
Gennadiy Civil
d3eb463a53
More msvc 14
2018-04-09 11:22:11 -04:00
Gennadiy Civil
c69e76c165
more warnings
2018-04-06 11:40:04 -04:00
Gennadiy Civil
7857d8da7a
merging gmock-actions 2
2018-04-06 09:50:01 -04:00
Gennadiy Civil
f906f8446e
Merging gMock, 2
2018-04-05 16:09:17 -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
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
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
94075ff9c0
Merge branch 'master' into variant_matcher
2018-02-27 16:03:36 -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
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
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
Carlos O'Ryan
63723d54aa
Add licenses() directive for googlemock/tests.
...
Without the directive embedding googletest into third_party breaks
any //... target.
2017-12-08 12:08:25 -05:00
Arkady Shapkin
a938f25467
Fix gmock tests when std::unary_function unavailable
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
950e2805da
Fix tests with VS2015 and VS2017
2017-10-25 16:04:01 +03:00
Jonathan Wakely
c61e22b1fe
Use gender-neutral pronouns in comments and docs
2017-09-27 13:31:13 +01:00
