aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
Commit message (Collapse)AuthorAgeFilesLines
* Googletest exportAbseil Team2018-12-031-1/+1
| | | | | | Applied fixes for ClangTidy modernize-use-override and modernize-use-using. PiperOrigin-RevId: 223800219
* 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/+5
|
* Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-121-44/+26
| | | | | | | | | | | | | | | | | | 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
* RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵Gennadiy Civil2018-04-101-2/+2
| | | | errors before merging the PR
* Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.Victor Costan2018-04-061-30/+60
| | | | | | | | | | | | | | Commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 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
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-251-0/+161