aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-05 13:38:42 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:45 (GMT)
commit6cfa087536abf3328cabbe867df978309034edc9 (patch)
tree54a82fe75fd11420ea4dc74d1b833a79ed5658d0
parent2024f258b66ead778b7c5e048e29967cfe7e8bf2 (diff)
downloadfluxbox_pavel-6cfa087536abf3328cabbe867df978309034edc9.zip
fluxbox_pavel-6cfa087536abf3328cabbe867df978309034edc9.tar.bz2
Make FbTk::MemFun[12] inherit from std::unary/binary_function
this way, they can be used as inputs to std::bind1st and friends
-rw-r--r--src/FbTk/MemFun.hh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/FbTk/MemFun.hh b/src/FbTk/MemFun.hh
index d19bb08..63f922e 100644
--- a/src/FbTk/MemFun.hh
+++ b/src/FbTk/MemFun.hh
@@ -22,6 +22,7 @@
22#ifndef FBTK_MEM_FUN_HH 22#ifndef FBTK_MEM_FUN_HH
23#define FBTK_MEM_FUN_HH 23#define FBTK_MEM_FUN_HH
24 24
25#include <functional>
25#include "SelectArg.hh" 26#include "SelectArg.hh"
26 27
27namespace FbTk { 28namespace FbTk {
@@ -55,7 +56,7 @@ MemFun( Object& obj, ReturnType (Object:: *action)() ) {
55 56
56/// One argument functor 57/// One argument functor
57template <typename ReturnType, typename Object, typename Arg1> 58template <typename ReturnType, typename Object, typename Arg1>
58class MemFun1 { 59class MemFun1: public std::unary_function<Arg1, ReturnType> {
59public: 60public:
60 typedef ReturnType (Object:: *Action)(Arg1); 61 typedef ReturnType (Object:: *Action)(Arg1);
61 62
@@ -82,7 +83,7 @@ MemFun( Object& obj, ReturnType (Object:: *action)(Arg1) ) {
82 83
83/// Two argument functor 84/// Two argument functor
84template <typename ReturnType, typename Object, typename Arg1, typename Arg2> 85template <typename ReturnType, typename Object, typename Arg1, typename Arg2>
85class MemFun2 { 86class MemFun2: public std::binary_function<Arg1, Arg2, ReturnType> {
86public: 87public:
87 typedef ReturnType (Object:: *Action)(Arg1,Arg2); 88 typedef ReturnType (Object:: *Action)(Arg1,Arg2);
88 89