diff options
author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-08-17 17:15:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 17:15:32 +0100 |
commit | 687964c84f798ce331fc60f6b8f212410ef46b3c (patch) | |
tree | 20ed743afd555c46b91361cf864c76643f1d89b2 /googlemock/include/gmock/internal/custom/gmock-generated-actions.h | |
parent | f11a8f9131584cf4009eca8af8a66e920c1b7391 (diff) | |
parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
download | googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.tar.gz googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.tar.bz2 googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.zip |
Merge branch 'master' into fix-argc
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_ |