diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 08:37:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 08:37:15 -0700 |
| commit | 7e7e3a6f45db62d470c9d15b062582e9e95d3bcd (patch) | |
| tree | 29039379de3d6fb3ef4c049d9b69faba9b4e5ccf /googlemock/include/gmock/gmock-generated-nice-strict.h | |
| parent | b50b2f775ed0268af9c83a96b285e296778d0743 (diff) | |
| parent | 997d343dd680e541ef96ce71ee54a91daf2577a0 (diff) | |
| download | googletest-7e7e3a6f45db62d470c9d15b062582e9e95d3bcd.tar.gz googletest-7e7e3a6f45db62d470c9d15b062582e9e95d3bcd.tar.bz2 googletest-7e7e3a6f45db62d470c9d15b062582e9e95d3bcd.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-nice-strict.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-nice-strict.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-generated-nice-strict.h b/googlemock/include/gmock/gmock-generated-nice-strict.h index 8e568730..91ba1d9b 100644 --- a/googlemock/include/gmock/gmock-generated-nice-strict.h +++ b/googlemock/include/gmock/gmock-generated-nice-strict.h @@ -30,8 +30,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // Implements class templates NiceMock, NaggyMock, and StrictMock. // @@ -63,6 +62,8 @@ // In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT // supported. +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_ |