GitLab

Remove multiple inheritance from "unintesting call" mock classes.

Internal CL 156157936, which was published in commit
fe402c27, introduced undefined behavior
by casting a base class (internal::{Naggy,Nice,Strict}Base<MockClass>,
using the curiously recurring template pattern) pointer to a derived
class ({Naggy,Nice,Strict}Mock<MockClass>), in the base class'
constructor. At that point, the object isn't guaranteed to have taken on
the shape of the derived class, and casting is undefined behavior.

The undefined behavior was caught by Chrome's CFI build bot [1], and
prevents rolling googletest past that commit / CL.

This commit simplifies the {Naggy,Nice,Strict}Mock class hierarchy in
a way that removes the undefined behavior.

[1] https://www.chromium.org/developers/testing/control-flow-integrity

Merging gmock-actions

...merging

Upstream cl/192179348

Upstream cl/192179348

Upstream cl 191754725

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