diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 10:35:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 10:35:56 -0400 |
commit | 1dad4cf52123f52896d63c8fd103b6c84bf6ae7c (patch) | |
tree | 85b7c60880416650d6006d4cdd09c2112d865596 /googlemock/include/gmock/gmock-generated-actions.h.pump | |
parent | 10f05a627c2da8d7de78da1b08f984ce8de398fb (diff) | |
parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
download | googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.gz googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.bz2 googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.zip |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-actions.h.pump')
-rw-r--r-- | googlemock/include/gmock/gmock-generated-actions.h.pump | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-generated-actions.h.pump b/googlemock/include/gmock/gmock-generated-actions.h.pump index 8bafa478..f1ee4a61 100644 --- a/googlemock/include/gmock/gmock-generated-actions.h.pump +++ b/googlemock/include/gmock/gmock-generated-actions.h.pump @@ -32,13 +32,14 @@ $$}} This meta comment fixes auto-indentation in editors. // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // Google Mock - a framework for writing C++ mock classes. // // This file implements some commonly used variadic actions. +// GOOGLETEST_CM0002 DO NOT DELETE + #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ @@ -86,8 +87,7 @@ $if i <= max_callback_arity [[ return callback->Run($gets); } ]] $else [[ - // There is no InvokeCallback() for $i-tuples, as google3 callbacks - // support $max_callback_arity arguments at most. + // There is no InvokeCallback() for $i-tuples ]] }; |