diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 11:13:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 11:13:12 -0400 |
| commit | 21e518557ad7634bc4b1fd57effa7e49a1405bb5 (patch) | |
| tree | 8484ccd28cc1bb4aa27c3b47b9a56cf9ee2ce66c /googlemock/include/gmock/internal/custom/gmock-generated-actions.h | |
| parent | 3e2cb75446e0f56f226f0fb259e032bb4d014002 (diff) | |
| parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
| download | googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.tar.gz googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.tar.bz2 googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.zip | |
Merge branch 'master' into josh/fix_scoped_class2
Diffstat (limited to 'googlemock/include/gmock/internal/custom/gmock-generated-actions.h')
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-generated-actions.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h index 7dc3b1ad..92d910cf 100644 --- a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h +++ b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h @@ -2,6 +2,8 @@ // pump.py gmock-generated-actions.h.pump // DO NOT EDIT BY HAND!!! +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ |