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.pump | |
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.pump')
-rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump index d26c8a08..67c221f1 100644 --- a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump +++ b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump @@ -1,9 +1,11 @@ $$ -*- mode: c++; -*- -$$ This is a Pump source file (http://go/pump). Please use Pump to convert +$$ This is a Pump source file. Please use Pump to convert $$ it to callback-actions.h. $$ $var max_callback_arity = 5 $$}} This meta comment fixes auto-indentation in editors. + +// 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_ |