diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2012-05-31 20:40:56 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2012-05-31 20:40:56 +0000 |
| commit | 2fd619edd3d1ec053f6276debdb513f1122ebcf3 (patch) | |
| tree | 3df112696485c11d5d0034d13f604d5f52be0a43 /include/gmock/gmock-generated-actions.h | |
| parent | 79a367eb217fcd47e2beaf8c0f87fe6d5926f739 (diff) | |
| download | googletest-2fd619edd3d1ec053f6276debdb513f1122ebcf3.tar.gz googletest-2fd619edd3d1ec053f6276debdb513f1122ebcf3.tar.bz2 googletest-2fd619edd3d1ec053f6276debdb513f1122ebcf3.zip | |
Pulls in gtest r615.
Renames internal enums to the kFoo naming style.
Fixes gmock doctor to work with newer versions of Clang.
Diffstat (limited to 'include/gmock/gmock-generated-actions.h')
| -rw-r--r-- | include/gmock/gmock-generated-actions.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h index 3b599b36..2327393d 100644 --- a/include/gmock/gmock-generated-actions.h +++ b/include/gmock/gmock-generated-actions.h @@ -2216,9 +2216,6 @@ DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6, p9##_type>::gmock_Impl<F>::gmock_PerformImpl(\ GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const -// TODO(wan@google.com): move the following to a different .h file -// such that we don't have to run 'pump' every time the code is -// updated. namespace testing { // The ACTION*() macros trigger warning C4100 (unreferenced formal |