diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 10:35:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 10:35:56 -0400 |
commit | 1dad4cf52123f52896d63c8fd103b6c84bf6ae7c (patch) | |
tree | 85b7c60880416650d6006d4cdd09c2112d865596 /googlemock/include/gmock/gmock-generated-matchers.h | |
parent | 10f05a627c2da8d7de78da1b08f984ce8de398fb (diff) | |
parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
download | googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.gz googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.bz2 googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.zip |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-matchers.h')
-rw-r--r-- | googlemock/include/gmock/gmock-generated-matchers.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-generated-matchers.h b/googlemock/include/gmock/gmock-generated-matchers.h index 21af61ba..0d46d23b 100644 --- a/googlemock/include/gmock/gmock-generated-matchers.h +++ b/googlemock/include/gmock/gmock-generated-matchers.h @@ -35,6 +35,8 @@ // // This file implements some commonly used variadic matchers. +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_MATCHERS_H_ |