aboutsummaryrefslogtreecommitdiffstats
path: root/include/gmock/gmock-generated-actions.h
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-03-26 19:06:45 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-03-26 19:06:45 +0000
commit3fbd2dd020819fcfd7cef2aa6a17fad73c41a0ee (patch)
treebea98a1704d173263e559d949c63289bec30d9f9 /include/gmock/gmock-generated-actions.h
parent68be111b4c82d3422ba2b83a8651033300ad4900 (diff)
downloadgoogletest-3fbd2dd020819fcfd7cef2aa6a17fad73c41a0ee.tar.gz
googletest-3fbd2dd020819fcfd7cef2aa6a17fad73c41a0ee.tar.bz2
googletest-3fbd2dd020819fcfd7cef2aa6a17fad73c41a0ee.zip
Makes gmock compile with gcc -Wall -Wextra -Wno-unused-parameter.
Diffstat (limited to 'include/gmock/gmock-generated-actions.h')
-rw-r--r--include/gmock/gmock-generated-actions.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h
index c2e155c2..60b5dc57 100644
--- a/include/gmock/gmock-generated-actions.h
+++ b/include/gmock/gmock-generated-actions.h
@@ -749,7 +749,7 @@ class SelectArgs<Result, ArgumentTuple,
public:
typedef Result type();
typedef typename Function<type>::ArgumentTuple SelectedArgs;
- static SelectedArgs Select(const ArgumentTuple& args) {
+ static SelectedArgs Select(const ArgumentTuple& /* args */) {
using ::std::tr1::get;
return SelectedArgs();
}
@@ -934,7 +934,6 @@ class WithArgsAction {
const InnerAction action_;
};
-
// Does two actions sequentially. Used for implementing the DoAll(a1,
// a2, ...) action.
template <typename Action1, typename Action2>