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 | |
| 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')
| -rw-r--r-- | include/gmock/gmock-generated-actions.h | 4 | ||||
| -rw-r--r-- | include/gmock/gmock-generated-actions.h.pump | 2 | ||||
| -rw-r--r-- | include/gmock/internal/custom/callback-actions.h | 8 | ||||
| -rw-r--r-- | include/gmock/internal/custom/gmock-generated-actions.h | 8 | ||||
| -rw-r--r-- | include/gmock/internal/custom/gmock-generated-actions.h.pump (renamed from include/gmock/internal/custom/callback-actions.h.pump) | 6 |
5 files changed, 14 insertions, 14 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_ diff --git a/include/gmock/gmock-generated-actions.h.pump b/include/gmock/gmock-generated-actions.h.pump index 77568c38..66d9f9d5 100644 --- a/include/gmock/gmock-generated-actions.h.pump +++ b/include/gmock/gmock-generated-actions.h.pump @@ -789,6 +789,6 @@ ACTION_TEMPLATE(ReturnNew, // Include any custom callback 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_ diff --git a/include/gmock/internal/custom/callback-actions.h b/include/gmock/internal/custom/callback-actions.h deleted file mode 100644 index 90db3047..00000000 --- a/include/gmock/internal/custom/callback-actions.h +++ /dev/null @@ -1,8 +0,0 @@ -// This file was GENERATED by command: -// pump.py callback-actions.h.pump -// DO NOT EDIT BY HAND!!! - -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_ACTIONS_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_ACTIONS_H_ - -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_ACTIONS_H_ diff --git a/include/gmock/internal/custom/gmock-generated-actions.h b/include/gmock/internal/custom/gmock-generated-actions.h new file mode 100644 index 00000000..7dc3b1ad --- /dev/null +++ b/include/gmock/internal/custom/gmock-generated-actions.h @@ -0,0 +1,8 @@ +// This file was GENERATED by command: +// pump.py gmock-generated-actions.h.pump +// DO NOT EDIT BY HAND!!! + +#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ +#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ + +#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ diff --git a/include/gmock/internal/custom/callback-actions.h.pump b/include/gmock/internal/custom/gmock-generated-actions.h.pump index df871a8f..d26c8a08 100644 --- a/include/gmock/internal/custom/callback-actions.h.pump +++ b/include/gmock/internal/custom/gmock-generated-actions.h.pump @@ -4,7 +4,7 @@ $$ it to callback-actions.h. $$ $var max_callback_arity = 5 $$}} This meta comment fixes auto-indentation in editors. -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_ACTIONS_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_ACTIONS_H_ +#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ +#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_ACTIONS_H_ +#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ |