From 6e1087218be351ce67af53328ccd5d97c8b8c169 Mon Sep 17 00:00:00 2001 From: kosak Date: Tue, 28 Jul 2015 00:53:13 +0000 Subject: Rename custom/callback-actions.h[.pump] => custom/gmock-generated-actions.h[.pump]. --- include/gmock/gmock-generated-actions.h | 4 ++-- include/gmock/gmock-generated-actions.h.pump | 2 +- include/gmock/internal/custom/callback-actions.h | 8 -------- include/gmock/internal/custom/callback-actions.h.pump | 10 ---------- include/gmock/internal/custom/gmock-generated-actions.h | 8 ++++++++ include/gmock/internal/custom/gmock-generated-actions.h.pump | 10 ++++++++++ scripts/gmock_doctor.py | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 include/gmock/internal/custom/callback-actions.h delete mode 100644 include/gmock/internal/custom/callback-actions.h.pump create mode 100644 include/gmock/internal/custom/gmock-generated-actions.h create mode 100644 include/gmock/internal/custom/gmock-generated-actions.h.pump diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h index f96b809..b5a889c 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 77568c3..66d9f9d 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 90db304..0000000 --- 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/callback-actions.h.pump b/include/gmock/internal/custom/callback-actions.h.pump deleted file mode 100644 index df871a8..0000000 --- a/include/gmock/internal/custom/callback-actions.h.pump +++ /dev/null @@ -1,10 +0,0 @@ -$$ -*- mode: c++; -*- -$$ This is a Pump source file (http://go/pump). Please use Pump to convert -$$ 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_ - -#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 0000000..7dc3b1a --- /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/gmock-generated-actions.h.pump b/include/gmock/internal/custom/gmock-generated-actions.h.pump new file mode 100644 index 0000000..d26c8a0 --- /dev/null +++ b/include/gmock/internal/custom/gmock-generated-actions.h.pump @@ -0,0 +1,10 @@ +$$ -*- mode: c++; -*- +$$ This is a Pump source file (http://go/pump). Please use Pump to convert +$$ it to callback-actions.h. +$$ +$var max_callback_arity = 5 +$$}} This meta comment fixes auto-indentation in editors. +#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/scripts/gmock_doctor.py b/scripts/gmock_doctor.py index 94e7af6..9ac4653 100755 --- a/scripts/gmock_doctor.py +++ b/scripts/gmock_doctor.py @@ -308,7 +308,7 @@ def _OverloadedFunctionActionDiagnoser(msg): clang_regex = (_CLANG_FILE_LINE_RE + r'error: no matching ' r'function for call to \'Invoke\'\r?\n' r'(.*\n)*?' - r'.*\bcallback-actions\.h:\d+:\d+:\s+' + r'.*\bgmock-generated-actions\.h:\d+:\d+:\s+' r'note: candidate template ignored:\s+' r'couldn\'t infer template argument \'FunctionImpl\'') diagnosis = """ @@ -334,7 +334,7 @@ def _OverloadedMethodActionDiagnoser(msg): clang_regex = (_CLANG_FILE_LINE_RE + r'error: no matching function ' r'for call to \'Invoke\'\r?\n' r'(.*\n)*?' - r'.*\bcallback-actions\.h:\d+:\d+: ' + r'.*\bgmock-generated-actions\.h:\d+:\d+: ' r'note: candidate function template not viable: ' r'requires .*, but 2 (arguments )?were provided') diagnosis = """ -- cgit v0.12