GitLab

Upstream cl/192179348

RE-Doing the merge, this time with gcc on mac in the PR 

pizza work, cont

osx pizzas, cont

fixing osx pizza

merging

merge

RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR

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

Revert "gmock actions 2"

gmock actions 2

this should be it

yet more

formatting

tuning

tuning

more

cont

testing msvc again

More msvc 14 

And also silence for MSVS14

preproc syntax ( I can never remember it)

syntax

cont.

continued

Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h

Commit fe402c27 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

more mcvs fixing