replace tabs space
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@334 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
parent
570f0ed652
commit
7fe4c81ff0
28 changed files with 799 additions and 778 deletions
|
|
@ -39,18 +39,18 @@ public:
|
|||
|
||||
|
||||
#ifndef LOKI_DISABLE_TYPELIST_MACROS
|
||||
Functor<void,LOKI_TYPELIST_1(bool &)> function(testFunction);
|
||||
Functor<void,LOKI_TYPELIST_1(bool &)> function(testFunction);
|
||||
Functor<void,LOKI_TYPELIST_1(bool &)> functor(testFunctor);
|
||||
Functor<void,LOKI_TYPELIST_1(bool &)> classFunctor(&testClass,&TestClass::member);
|
||||
Functor<void,LOKI_TYPELIST_1(bool &)> functorCopy(function);
|
||||
Functor<void,NullType> bindFunctor(BindFirst(function,testResult));
|
||||
Functor<void> chainFunctor(Chain(bindFunctor,bindFunctor));
|
||||
#else
|
||||
Functor<void,Seq<bool &> > function(testFunction);
|
||||
Functor<void,Seq<bool &> > function(testFunction);
|
||||
Functor<void,Seq<bool &> > functor(testFunctor);
|
||||
Functor<void,Seq<bool &> > classFunctor(&testClass,&TestClass::member);
|
||||
Functor<void,Seq<bool &> > functorCopy(function);
|
||||
//TODO:
|
||||
//TODO:
|
||||
//Functor<void,NullType> bindFunctor(BindFirst(function,testResult));
|
||||
//Functor<void> chainFunctor(Chain(bindFunctor,bindFunctor));
|
||||
#endif
|
||||
|
|
@ -83,8 +83,8 @@ public:
|
|||
r=functionResult && functorResult && classFunctorResult && functorCopyResult && bindFunctorResult &&
|
||||
chainFunctorResult;
|
||||
#else
|
||||
//TODO!
|
||||
r=functionResult && functorResult && classFunctorResult && functorCopyResult;
|
||||
//TODO!
|
||||
r=functionResult && functorResult && classFunctorResult && functorCopyResult;
|
||||
#endif
|
||||
|
||||
testAssert("Functor",r,result);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ public:
|
|||
using namespace Loki;
|
||||
using namespace Loki::TL;
|
||||
|
||||
typedef Seq<char>::Type CharList;
|
||||
typedef Seq<char>::Type CharList;
|
||||
typedef Seq<char,int,double>::Type CharIntDoubleList;
|
||||
typedef Seq<char,int,double,char>::Type CharIntDoubleCharList;
|
||||
typedef Seq<Base,Derived1,Derived2>::Type BaseDerived1Derived2List;
|
||||
|
|
|
|||
|
|
@ -162,12 +162,12 @@ private:
|
|||
} smallObjectTest;
|
||||
|
||||
#ifndef SMALLOBJ_CPP
|
||||
# define SMALLOBJ_CPP
|
||||
# ifdef LOKI_NONCC
|
||||
# include "../../include/noncc/loki/SmallObj.cpp"
|
||||
# else
|
||||
# include "../../src/SmallObj.cpp"
|
||||
# endif
|
||||
# define SMALLOBJ_CPP
|
||||
# ifdef LOKI_NONCC
|
||||
# include "../../include/noncc/loki/SmallObj.cpp"
|
||||
# else
|
||||
# include "../../src/SmallObj.cpp"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -19,44 +19,44 @@
|
|||
|
||||
namespace ThreadsTestPrivate
|
||||
{
|
||||
class SingleLevel : public Loki::SingleThreaded<SingleLevel>
|
||||
{
|
||||
int i;
|
||||
public:
|
||||
void test()
|
||||
{
|
||||
Lock lock0;
|
||||
Lock lock(*this);
|
||||
Lock lockThis(this);
|
||||
i++;
|
||||
}
|
||||
};
|
||||
class SingleLevel : public Loki::SingleThreaded<SingleLevel>
|
||||
{
|
||||
int i;
|
||||
public:
|
||||
void test()
|
||||
{
|
||||
Lock lock0;
|
||||
Lock lock(*this);
|
||||
Lock lockThis(this);
|
||||
i++;
|
||||
}
|
||||
};
|
||||
|
||||
class ClassLevel : public Loki::ClassLevelLockable<ClassLevel>
|
||||
{
|
||||
int i;
|
||||
public:
|
||||
void test()
|
||||
{
|
||||
Lock lock0;
|
||||
Lock lock(*this);
|
||||
Lock lockThis(this);
|
||||
i++;
|
||||
}
|
||||
};
|
||||
class ClassLevel : public Loki::ClassLevelLockable<ClassLevel>
|
||||
{
|
||||
int i;
|
||||
public:
|
||||
void test()
|
||||
{
|
||||
Lock lock0;
|
||||
Lock lock(*this);
|
||||
Lock lockThis(this);
|
||||
i++;
|
||||
}
|
||||
};
|
||||
|
||||
class ObjectLevel : public Loki::ObjectLevelLockable<ObjectLevel>
|
||||
{
|
||||
int i;
|
||||
public:
|
||||
void test()
|
||||
{
|
||||
//Lock lock0_must_not_compile;
|
||||
Lock lock(*this);
|
||||
Lock lockThis(this);
|
||||
i++;
|
||||
}
|
||||
};
|
||||
class ObjectLevel : public Loki::ObjectLevelLockable<ObjectLevel>
|
||||
{
|
||||
int i;
|
||||
public:
|
||||
void test()
|
||||
{
|
||||
//Lock lock0_must_not_compile;
|
||||
Lock lock(*this);
|
||||
Lock lockThis(this);
|
||||
i++;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
class ThreadsTest : public Test
|
||||
|
|
@ -68,7 +68,7 @@ public:
|
|||
{
|
||||
printName(result);
|
||||
|
||||
bool r = true; // TODO some tests
|
||||
bool r = true; // TODO some tests
|
||||
|
||||
testAssert("Threads",r,result);
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ public:
|
|||
SameType<TypeTraits<int>::ParameterType,int>::value &&
|
||||
SameType<TypeTraits<double>::ParameterType,double>::value &&
|
||||
SameType<TypeTraits<Test&>::ParameterType,Test &>::value &&
|
||||
SameType<TypeTraits<Test>::ParameterType,const Test &>::value;
|
||||
SameType<TypeTraits<Test>::ParameterType,const Test &>::value;
|
||||
|
||||
testAssert("TypeTraits",r,result);
|
||||
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ private:
|
|||
|
||||
void testFunction();
|
||||
void testFunctionPointer();
|
||||
void testMemberFunctionPointer();
|
||||
void testMemberFunctionPointer();
|
||||
|
||||
void testParameterType();
|
||||
void testReferredType();
|
||||
|
|
@ -220,7 +220,7 @@ inline void TypeTraitsTest2::execute(TestResult &result)
|
|||
|
||||
testFunction();
|
||||
testFunctionPointer();
|
||||
testMemberFunctionPointer();
|
||||
testMemberFunctionPointer();
|
||||
|
||||
bool r = erroneousConditions_ == 0;
|
||||
|
||||
|
|
@ -581,7 +581,7 @@ inline void TypeTraitsTest2::testFunction()
|
|||
#undef CONDITION
|
||||
#define CONDITION isFunction
|
||||
|
||||
testBegin("isFunction");
|
||||
testBegin("isFunction");
|
||||
|
||||
PASS(void());
|
||||
PASS(void(int, float, ...));
|
||||
|
|
@ -597,9 +597,9 @@ inline void TypeTraitsTest2::testFunctionPointer()
|
|||
#undef CONDITION
|
||||
#define CONDITION isFunctionPointer
|
||||
|
||||
testBegin("isFunctionPointer");
|
||||
testBegin("isFunctionPointer");
|
||||
|
||||
PASS(void (*)());
|
||||
PASS(void (*)());
|
||||
FAIL(void (A::* const volatile)());
|
||||
FAIL(void (A::* const volatile)() const);
|
||||
FAIL(void (A::* const volatile)() volatile);
|
||||
|
|
@ -624,7 +624,7 @@ inline void TypeTraitsTest2::testMemberFunctionPointer()
|
|||
#undef CONDITION
|
||||
#define CONDITION isMemberFunctionPointer
|
||||
|
||||
testBegin("isMemberFunctionPointer");
|
||||
testBegin("isMemberFunctionPointer");
|
||||
|
||||
PASS(void (A::* const volatile)());
|
||||
PASS(void (A::* const volatile)() const);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public:
|
|||
using namespace Loki::TL;
|
||||
|
||||
#ifndef LOKI_DISABLE_TYPELIST_MACROS
|
||||
typedef LOKI_TYPELIST_1(char) CharList;
|
||||
typedef LOKI_TYPELIST_1(char) CharList;
|
||||
typedef LOKI_TYPELIST_3(char,int,double) CharIntDoubleList;
|
||||
typedef LOKI_TYPELIST_4(char,int,double,char) CharIntDoubleCharList;
|
||||
typedef LOKI_TYPELIST_3(Base,Derived1,Derived2) BaseDerived1Derived2List;
|
||||
|
|
@ -43,8 +43,8 @@ public:
|
|||
typedef LOKI_TYPELIST_4(Base,Derived1,Base,Derived2) BaseDerived1BaseDerived2List;
|
||||
typedef LOKI_TYPELIST_4(Derived1,Base,Derived1,Derived2) Derived1BaseDerived1Derived2List;
|
||||
#else
|
||||
typedef Seq<char>::Type CharList;
|
||||
typedef Seq<char,int,double>::Type CharIntDoubleList;
|
||||
typedef Seq<char>::Type CharList;
|
||||
typedef Seq<char,int,double>::Type CharIntDoubleList;
|
||||
typedef Seq<char,int,double,char>::Type CharIntDoubleCharList;
|
||||
typedef Seq<Base,Derived1,Derived2>::Type BaseDerived1Derived2List;
|
||||
typedef Seq<Derived2,Derived1,Base>::Type Derived2Derived1BaseList;
|
||||
|
|
@ -179,8 +179,8 @@ public:
|
|||
|
||||
#else //LOKI_DISABLE_TYPELIST_MACROS
|
||||
|
||||
r=SameType<Append<NullType,NullType>::Result,NullType>::value &&
|
||||
SameType<Append<NullType,char>::Result,Seq<char>::Type >::value &&
|
||||
r=SameType<Append<NullType,NullType>::Result,NullType>::value &&
|
||||
SameType<Append<NullType,char>::Result,Seq<char>::Type >::value &&
|
||||
SameType<Append<NullType,CharList>::Result,CharList>::value &&
|
||||
SameType<Append<CharList,NullType>::Result,CharList>::value &&
|
||||
SameType<Append<CharList,int>::Result,Seq<char,int>::Type >::value &&
|
||||
|
|
@ -254,7 +254,7 @@ public:
|
|||
SameType<DerivedToFront<CharIntDoubleCharList>::Result,CharIntDoubleCharList>::value &&
|
||||
SameType<DerivedToFront<BaseDerived1Derived2List>::Result,Derived2Derived1BaseList>::value &&
|
||||
SameType<DerivedToFront<Derived2Derived1BaseList>::Result,Derived2Derived1BaseList>::value &&
|
||||
SameType<DerivedToFront<BaseDerived1BaseDerived2List>::Result,Seq<Derived2,Derived1,Base,Base>::Type >::value &&
|
||||
SameType<DerivedToFront<BaseDerived1BaseDerived2List>::Result,Seq<Derived2,Derived1,Base,Base>::Type >::value &&
|
||||
SameType<DerivedToFront<Derived1BaseDerived1Derived2List>::Result,Seq<Derived2,Derived1,Derived1,Base>::Type >::value;
|
||||
|
||||
testAssert("DerivedToFront",r,result);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue