Gennadiy Civil
106e731e68
Merge branch 'master' of https://github.com/google/googletest
7 years ago
Gennadiy Civil
c13ab6003b
merging
7 years ago
Gennadiy Civil
d5988e7dd0
Merge pull request #1558 from gennadiycivil/master
...
RE-Doing the merge, this time with gcc on mac in the PR
7 years ago
Gennadiy Civil
5cd213ea5e
..and this should be it
7 years ago
Gennadiy Civil
6a7573a7de
more
7 years ago
Gennadiy Civil
039d9b54c2
pizza work, cont
7 years ago
Gennadiy Civil
f15fd9610b
osx pizzas, cont
7 years ago
Gennadiy Civil
b15be9a819
fixing osx pizza
7 years ago
Gennadiy Civil
6f9db26159
merging
7 years ago
Gennadiy Civil
9bc82ce725
merging
7 years ago
Gennadiy Civil
25d8176e4f
merging
7 years ago
Gennadiy Civil
39c58da187
merge
7 years ago
Gennadiy Civil
e1071eb949
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
7 years ago
Gennadiy Civil
8fbb419470
Include gcc on mac into PR matrix
...
There was an error that slipped through and only showed up on PR merge (https://travis-ci.org/google/googletest/jobs/364304396/config ) , we dont want that again
7 years ago
Gennadiy Civil
a072611118
Merge pull request #1556 from google/revert-1551-master
...
Revert "gmock actions 2"
7 years ago
Gennadiy Civil
ca54b67303
Revert "gmock actions 2"
7 years ago
Gennadiy Civil
7f03f7ceae
Merge pull request #1551 from gennadiycivil/master
...
gmock actions 2
7 years ago
Gennadiy Civil
64d24b810f
... and this
7 years ago
Gennadiy Civil
c1d4c34233
this should be it
7 years ago
Gennadiy Civil
f5871009e6
yet more
7 years ago
Gennadiy Civil
05b5a53898
formatting
7 years ago
Gennadiy Civil
2de24fbf7a
tuning
7 years ago
Gennadiy Civil
055f32199a
tuning
7 years ago
Gennadiy Civil
57d6e824b4
more
7 years ago
Gennadiy Civil
44da2b9ac5
cont
7 years ago
Gennadiy Civil
e93a0ece26
msvc
7 years ago
Gennadiy Civil
c4684b49cf
more msvc
7 years ago
Gennadiy Civil
431bfdcaf4
msvc 14
7 years ago
Gennadiy Civil
8bc7c631e8
testing msvc again
7 years ago
Gennadiy Civil
c4e3d77ddc
More msvc 14
7 years ago
Gennadiy Civil
6525044ce2
And also silence for MSVS14
7 years ago
Gennadiy Civil
35a709a701
preproc syntax ( I can never remember it)
7 years ago
Gennadiy Civil
61e8a0b10b
syntax
7 years ago
Gennadiy Civil
03be5df17c
cont.
7 years ago
Gennadiy Civil
e0b3c269c2
continued
7 years ago
Gennadiy Civil
d0de1180e4
Merge branch 'master' of github.com:google/googletest
7 years ago
Gennadiy Civil
7529698fa3
Merge pull request #1552 from pwnall/mock-pump
...
Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h
7 years ago
Victor Costan
51f8ad47df
Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.
...
Commit fe402c2779
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
7 years ago
Gennadiy Civil
dbd206e3d9
more mcvs fixing
7 years ago
Gennadiy Civil
701e1e5dc1
linkage, fixing MSVC
7 years ago
Gennadiy Civil
2d4d4ef739
fixing MSVC
7 years ago
Gennadiy Civil
5fe8de5ded
more warnings
7 years ago
Gennadiy Civil
cb13dc759c
more warnings
7 years ago
Gennadiy Civil
d9f3611a22
more MSVC warnings
7 years ago
Gennadiy Civil
c75b76e20a
warnings
7 years ago
Gennadiy Civil
04e31881fc
cont - 2
7 years ago
Gennadiy Civil
32ac949254
cont
7 years ago
Gennadiy Civil
1831ac9361
more warnings
7 years ago
Gennadiy Civil
eb3e4aac2e
deal with MSVC warn, cont 1
7 years ago
Gennadiy Civil
50c0bcd7e3
Cont. deal with MCVS warnings
7 years ago