eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,386 Commits 13 Branches 14 Tags
Commit Graph

366 Commits

Author SHA1 Message Date
Gennadiy Civil
a958171f8a preproc syntax ( I can never remember it) 2018-04-09 10:25:59 -04:00
Gennadiy Civil
566ef95d7b syntax 2018-04-09 10:08:12 -04:00
Gennadiy Civil
c0608ebfd9 cont. 2018-04-09 09:59:09 -04:00
Gennadiy Civil
a694e474a3 continued 2018-04-09 09:51:02 -04:00
Gennadiy Civil
a31ca9f2f8 Merge branch 'master' of github.com:google/googletest 2018-04-09 09:29:37 -04:00
Victor Costan
a19ef8a031 Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. 
Commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 published the changes in
internal CL 156157936, but missed the diff in
gmock-generated-nice-strict.h.pump. This makes it difficult to reason
about the change, because the .pump file is more concise than the
generated file.

This PR was tested by re-generating the .h file using the command below
and checking the git diff.

./googletest/scripts/pump.py \
    googlemock/include/gmock/gmock-generated-nice-strict.h.pump
 2018-04-06 17:21:05 -07:00
Gennadiy Civil
5544bd6303 more mcvs fixing 2018-04-06 16:55:46 -04:00
Gennadiy Civil
fb63da38e7 linkage, fixing MSVC 2018-04-06 16:43:35 -04:00
Gennadiy Civil
fafa60ab77 fixing MSVC 2018-04-06 16:31:11 -04:00
Henry Schreiner
4c52b34432 Merge branch 'master' into cleanup-cmake 2018-04-06 21:52:42 +02:00
Gennadiy Civil
c69e76c165 more warnings 2018-04-06 11:40:04 -04:00
Gennadiy Civil
6573981317 warnings 2018-04-06 11:00:13 -04:00
Gennadiy Civil
1e454bdbcc cont - 2 2018-04-06 10:52:49 -04:00
Gennadiy Civil
907d5d1a7a cont 2018-04-06 10:43:11 -04:00
Gennadiy Civil
55451e85bb more warnings 2018-04-06 10:35:09 -04:00
Gennadiy Civil
a603ff235a deal with MSVC warn, cont 1 2018-04-06 10:24:49 -04:00
Gennadiy Civil
aa397015ee Cont. deal with MCVS warnings 2018-04-06 10:15:00 -04:00
Gennadiy Civil
cb430d1205 Deal with MCVS warnings 2018-04-06 10:01:40 -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
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
Henry Fredrick Schreiner
fd9d5d7b5b Clean up cache non-advanced variable for subproject 2018-04-05 13:40:26 +02: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