diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-08 12:19:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 12:19:04 -0700 |
commit | 11f5a2740aa8a55d620fba6957e53ad08721cf54 (patch) | |
tree | 04f982e6158e57f68529ca47e37ec377574647dd /googlemock/include/gmock/internal/custom/gmock-generated-actions.h | |
parent | 008e54c1dd407b6edd680fccf78cd194365e0507 (diff) | |
parent | 66bd580b5bc054522f7fab13463a47aa156a2d4b (diff) | |
download | googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.gz googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.bz2 googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.zip |
Merge branch 'master' into cross-testing-patch-1
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_ |