diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /common/func.h | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'common/func.h')
| -rw-r--r-- | common/func.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/func.h b/common/func.h index e09ab1a438..db57d73668 100644 --- a/common/func.h +++ b/common/func.h @@ -424,7 +424,7 @@ private: * are interesting for that matter. */ template<class Arg, class Res> -struct Functor1 : public Common::UnaryFunction<Arg, Res> { +struct Functor1 : public UnaryFunction<Arg, Res> { virtual ~Functor1() {} virtual bool isValid() const = 0; @@ -460,7 +460,7 @@ private: * @see Functor1 */ template<class Arg1, class Arg2, class Res> -struct Functor2 : public Common::BinaryFunction<Arg1, Arg2, Res> { +struct Functor2 : public BinaryFunction<Arg1, Arg2, Res> { virtual ~Functor2() {} virtual bool isValid() const = 0; @@ -538,4 +538,3 @@ GENERATE_TRIVIAL_HASH_FUNCTOR(unsigned long); } // End of namespace Common #endif - |