Gennadiy Civil
05b5a53898
formatting
2018-04-09 15:50:19 -04:00
Gennadiy Civil
2de24fbf7a
tuning
2018-04-09 15:39:12 -04:00
Gennadiy Civil
055f32199a
tuning
2018-04-09 15:38:38 -04:00
Gennadiy Civil
57d6e824b4
more
2018-04-09 15:33:56 -04:00
Gennadiy Civil
44da2b9ac5
cont
2018-04-09 15:23:00 -04:00
Gennadiy Civil
e93a0ece26
msvc
2018-04-09 13:51:01 -04:00
Gennadiy Civil
c4684b49cf
more msvc
2018-04-09 12:03:40 -04:00
Gennadiy Civil
431bfdcaf4
msvc 14
2018-04-09 11:48:02 -04:00
Gennadiy Civil
8bc7c631e8
testing msvc again
2018-04-09 11:35:01 -04:00
Gennadiy Civil
c4e3d77ddc
More msvc 14
2018-04-09 11:22:11 -04:00
Gennadiy Civil
6525044ce2
And also silence for MSVS14
2018-04-09 10:51:15 -04:00
Gennadiy Civil
35a709a701
preproc syntax ( I can never remember it)
2018-04-09 10:25:59 -04:00
Gennadiy Civil
61e8a0b10b
syntax
2018-04-09 10:08:12 -04:00
Gennadiy Civil
03be5df17c
cont.
2018-04-09 09:59:09 -04:00
Gennadiy Civil
e0b3c269c2
continued
2018-04-09 09:51:02 -04:00
Gennadiy Civil
d0de1180e4
Merge branch 'master' of github.com:google/googletest
2018-04-09 09:29:37 -04:00
Gennadiy Civil
7529698fa3
Merge pull request #1552 from pwnall/mock-pump
...
Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h
2018-04-09 09:28:35 -04:00
Victor Costan
51f8ad47df
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
dbd206e3d9
more mcvs fixing
2018-04-06 16:55:46 -04:00
Gennadiy Civil
701e1e5dc1
linkage, fixing MSVC
2018-04-06 16:43:35 -04:00
Gennadiy Civil
2d4d4ef739
fixing MSVC
2018-04-06 16:31:11 -04:00
Henry Schreiner
4b6a7a49ab
Merge branch 'master' into cleanup-cmake
2018-04-06 21:52:42 +02:00
Gennadiy Civil
5fe8de5ded
more warnings
2018-04-06 11:40:04 -04:00
Gennadiy Civil
cb13dc759c
more warnings
2018-04-06 11:26:12 -04:00
Gennadiy Civil
d9f3611a22
more MSVC warnings
2018-04-06 11:17:45 -04:00
Gennadiy Civil
c75b76e20a
warnings
2018-04-06 11:00:13 -04:00
Gennadiy Civil
04e31881fc
cont - 2
2018-04-06 10:52:49 -04:00
Gennadiy Civil
32ac949254
cont
2018-04-06 10:43:11 -04:00
Gennadiy Civil
1831ac9361
more warnings
2018-04-06 10:35:09 -04:00
Gennadiy Civil
eb3e4aac2e
deal with MSVC warn, cont 1
2018-04-06 10:24:49 -04:00
Gennadiy Civil
50c0bcd7e3
Cont. deal with MCVS warnings
2018-04-06 10:15:00 -04:00
Gennadiy Civil
b5c87fbcb6
Deal with MCVS warnings
2018-04-06 10:01:40 -04:00
Gennadiy Civil
427b6a297f
Merge branch 'master' of github.com:google/googletest
2018-04-06 09:50:14 -04:00
Gennadiy Civil
88fc7d7552
merging gmock-actions 2
2018-04-06 09:50:01 -04:00
Gennadiy Civil
82febb8eaf
Merge pull request #1549 from gennadiycivil/master
...
Merging gMock, 2
2018-04-05 16:20:18 -04:00
Gennadiy Civil
bee1d13fcc
Merge branch 'master' of github.com:google/googletest
2018-04-05 16:09:31 -04:00
Gennadiy Civil
fe402c2779
Merging gMock, 2
2018-04-05 16:09:17 -04:00
Gennadiy Civil
d0905653ed
Merge pull request #1547 from gennadiycivil/master
...
Matchers testing
2018-04-05 14:53:02 -04:00
Gennadiy Civil
7e5f90d378
formatting
2018-04-05 14:41:16 -04:00
Gennadiy Civil
928636135b
And more MCVS warnings
2018-04-05 14:24:12 -04:00
Gennadiy Civil
e0f4cf0561
fixing MCVS warn
2018-04-05 14:00:14 -04:00
Gennadiy Civil
7045138a0d
Have to wait for this one
2018-04-05 11:59:59 -04:00
Gennadiy Civil
66eaf9f0eb
Have to wait for this one
2018-04-05 11:55:25 -04:00
Gennadiy Civil
af93d59eb7
Merging matchers test
2018-04-05 11:35:20 -04:00
Gennadiy Civil
47d15bceea
Merge branch 'master' of github.com:google/googletest
2018-04-05 11:34:32 -04:00
Gennadiy Civil
0cd6a4f5f5
Merging matchers test
2018-04-05 11:34:19 -04:00
Henry Fredrick Schreiner
b22e8dec40
Clean up cache non-advanced variable for subproject
2018-04-05 13:40:26 +02:00
Gennadiy Civil
2cf2a1f8ce
Merge pull request #1545 from gennadiycivil/master
...
merging gmock matchers 1
2018-04-04 16:14:41 -04:00
Gennadiy Civil
f7098a2a4d
Merge branch 'master' into master
2018-04-04 16:01:44 -04:00
Gennadiy Civil
d81b6a0c4c
bad cut/paste
2018-04-04 15:46:04 -04:00
