From f05942295b3be6d96143dd41798571dc97333933 Mon Sep 17 00:00:00 2001 From: syntheticpp Date: Thu, 1 Jun 2006 13:08:14 +0000 Subject: [PATCH] also test Functor with Seq<> git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@668 7ec92016-0320-0410-acc4-a06ded1c099a --- test/RegressionTest/FunctorTest.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/RegressionTest/FunctorTest.h b/test/RegressionTest/FunctorTest.h index 56150c5..a43ac01 100755 --- a/test/RegressionTest/FunctorTest.h +++ b/test/RegressionTest/FunctorTest.h @@ -77,9 +77,14 @@ public: Functor > classFunctor2(&testClass,&TestClass::member); Functor > functorCopy(function); Functor > functorCopy2(function); + //TODO: - //Functor bindFunctor(BindFirst(function,testResult)); - //Functor chainFunctor(Chain(bindFunctor,bindFunctor)); + // BindFirst and Chainer + + Functor > member_func(&testClass,&TestClass::member); + Functor > free_func(&free_function); + Functor > NULL_func; + Functor > NULL_func0; #endif testResult=false; @@ -115,7 +120,7 @@ public: bool null4 = member_func != NULL_func; -#ifdef LOKI_DISABLE_TYPELIST_MACROS +#ifndef LOKI_DISABLE_TYPELIST_MACROS bool bindFunctorCompare = bindFunctor==bindFunctor2; bool chainFunctorCompare = chainFunctor==chainFunctor2; @@ -133,11 +138,10 @@ public: null3 && null4 #ifndef LOKI_DISABLE_TYPELIST_MACROS - ; -#else - && bindFunctorCompare && chainFunctorCompare; +#else + ; #endif #else @@ -146,7 +150,7 @@ public: #endif //LOKI_FUNCTORS_ARE_COMPARABLE -#ifdef LOKI_DISABLE_TYPELIST_MACROS +#ifndef LOKI_DISABLE_TYPELIST_MACROS testResult=false; bindFunctor();