GitLab

merging, testing, this should be it

more pizza

more OSX pizzas

osx pizzas

merging gmock actions test 

merging, gmock actions test 

merging

more fixing osx libstd++ bugs

fixing 

merging, fix OSX issue

merging

merging 

merging 

msvc

revert this one

merge, ... gmock-matchers test

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

Upstream cl/192179348

pizza work, cont

osx pizzas, cont

fixing osx pizza

merging

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

yet more

formatting

tuning

tuning

cont