[libsigcplusplus] compose: Remove unnecessary getter/setter aliases.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsigcplusplus] compose: Remove unnecessary getter/setter aliases.
- Date: Wed, 13 Apr 2016 20:41:33 +0000 (UTC)
commit 9994abc97fd1064a5321954e3f5e6bc6ab47ce19
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Apr 13 22:31:12 2016 +0200
compose: Remove unnecessary getter/setter aliases.
sigc++/adaptors/compose.h | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/sigc++/adaptors/compose.h b/sigc++/adaptors/compose.h
index bd4ef93..79a94dc 100644
--- a/sigc++/adaptors/compose.h
+++ b/sigc++/adaptors/compose.h
@@ -43,9 +43,6 @@ namespace sigc
template <class T_setter, class T_getter>
struct compose1_functor : public adapts<T_setter>
{
- using setter_type = T_setter;
- using getter_type = T_getter;
-
decltype(auto) operator()() { return this->functor_(get_()); }
template <class... T_arg>
@@ -64,7 +61,7 @@ struct compose1_functor : public adapts<T_setter>
{
}
- getter_type get_; // public, so that visit_each() can access it
+ T_getter get_; // public, so that visit_each() can access it
};
/** Adaptor that combines three functors.
@@ -84,10 +81,6 @@ private:
using adaptor_type = typename adapts<T_setter>::adaptor_type;
public:
- using setter_type = T_setter;
- using getter1_type = T_getter1;
- using getter2_type = T_getter2;
-
decltype(auto) operator()() { return this->functor_(get1_(), get2_()); }
template <class... T_arg>
@@ -108,8 +101,8 @@ public:
{
}
- getter1_type get1_; // public, so that visit_each() can access it
- getter2_type get2_; // public, so that visit_each() can access it
+ T_getter1 get1_; // public, so that visit_each() can access it
+ T_getter2 get2_; // public, so that visit_each() can access it
};
#ifndef DOXYGEN_SHOULD_SKIP_THIS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]