diff options
| author | kosak <kosak@google.com> | 2015-07-28 00:53:13 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2015-07-28 00:53:13 +0000 |
| commit | 6e1087218be351ce67af53328ccd5d97c8b8c169 (patch) | |
| tree | f2260edc093ffec7cf9715e787ee83e26f99dd36 /include/gmock/gmock-generated-actions.h | |
| parent | 01db9d469ba113cee5040ba65bb98b2cb04c8583 (diff) | |
| download | googletest-6e1087218be351ce67af53328ccd5d97c8b8c169.tar.gz googletest-6e1087218be351ce67af53328ccd5d97c8b8c169.tar.bz2 googletest-6e1087218be351ce67af53328ccd5d97c8b8c169.zip | |
Rename custom/callback-actions.h[.pump] =>
custom/gmock-generated-actions.h[.pump].
Diffstat (limited to 'include/gmock/gmock-generated-actions.h')
| -rw-r--r-- | include/gmock/gmock-generated-actions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h index f96b809f..b5a889c0 100644 --- a/include/gmock/gmock-generated-actions.h +++ b/include/gmock/gmock-generated-actions.h @@ -2369,9 +2369,9 @@ ACTION_TEMPLATE(ReturnNew, } // namespace testing -// Include any custom callback actions added by the local installation. +// Include any custom actions added by the local installation. // We must include this header at the end to make sure it can use the // declarations from this file. -#include "gmock/internal/custom/callback-actions.h" +#include "gmock/internal/custom/gmock-generated-actions.h" #endif // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ |