aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-generated-nice-strict.h
Commit message (Collapse)AuthorAgeFilesLines
* Comments changes, no functionality changesGennadiy Civil2018-08-141-2/+1
|
* Formatting changes for automatic code managementGennadiy Civil2018-07-271-0/+2
|
* merging Gennadiy Civil2018-04-121-0/+15
|
* Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-121-158/+174
| | | | | | | | | | | | | | | | | | Internal CL 156157936, which was published in commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71, 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, 2Gennadiy Civil2018-04-051-170/+200
|
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-251-0/+397