diff --git a/sflphone-common/libs/utilspp/Functors.hpp b/sflphone-common/libs/utilspp/Functors.hpp
deleted file mode 100644
index 1751185d962b83c77ee05aa1de71080586b358b5..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/Functors.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_FUNCTORS_HPP
-#define UTILSPP_FUNCTORS_HPP
-
-#include "functor/Functor.hpp"
-
-#endif
diff --git a/sflphone-common/libs/utilspp/Makefile.am b/sflphone-common/libs/utilspp/Makefile.am
index 01bff558414d75132d9819f1628c8574730913b2..855888bb35d66acc03e34f9d200b0ebd22143cd3 100644
--- a/sflphone-common/libs/utilspp/Makefile.am
+++ b/sflphone-common/libs/utilspp/Makefile.am
@@ -1,16 +1,13 @@
-SUBDIRS = functor singleton
+SUBDIRS = singleton
noinst_LTLIBRARIES = libutilspp.la
libutilspp_la_SOURCES = \
EmptyType.hpp \
- Functors.hpp \
NonCopyable.hpp \
NullType.hpp \
Singleton.hpp \
- SmartPtr.hpp \
ThreadingFactoryMutex.hpp ThreadingFactoryMutex.inl \
- ThreadingSingle.hpp ThreadingSingle.inl \
- TypeList.hpp
+ ThreadingSingle.hpp ThreadingSingle.inl
libutilspp_la_LIBADD = ./singleton/libsingleton.la
diff --git a/sflphone-common/libs/utilspp/SmartPtr.hpp b/sflphone-common/libs/utilspp/SmartPtr.hpp
deleted file mode 100644
index b621bb74e625ad6f28f2fc933e7fee250b0c9dd2..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/SmartPtr.hpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_SMARTPTR_HPP
-#define UTILSPP_SMARTPTR_HPP
-
-#include <stdexcept>
-#include "NonCopyable.hpp"
-
-#define NULL_BODY_ERROR "the smart pointer contain a NULL pointer"
-
-namespace utilspp
-{
-
- template < typename Type = unsigned int >
- class FastCount
- {
- public:
- FastCount(Type count = 1) : mCount(count)
- {}
-
- FastCount &operator++()
- {
- mCount++;
- return *this;
- }
-
- FastCount &operator--()
- {
- mCount--;
- return *this;
- }
-
- operator Type()
- {
- return mCount;
- }
-
- Type useCount()
- {
- return mCount;
- }
-
- private:
- Type mCount;
- };
-
-
- template < typename ContentType, typename CountPolicy = FastCount >
- class CountingBody : public utilspp::NonCopyable
- {
- public:
- CountingBody(ContentType *body) : mBody(body)
- {}
-
- void inc()
- {
- ++mCount;
- }
-
- void dec()
- {
- --mCount;
- if (mCount <= 0) {
- delete this;
- }
- }
-
- ContentType *get()
- {
- return mBody;
- }
-
- protected:
- ~CountingBody()
- {
- if (mBody != NULL) {
- delete mBody;
- mBody = NULL;
- }
- }
-
- private:
- CountPolicy mCount;
- ContentType *mBody;
- };
-
-
- template < typename ContentType, typename CountingBodyPolicy = CountingBody>
- class SharedPtr
- {
- public:
- SharedPtr() : mContent(new CountingPolicy< ContentType >(NULL))
- {}
-
- explicit SharedPtr(ContentType *content) : mContent(new CountingBodyPolicy< ContentType >(content))
- {}
-
- ~SharedPtr()
- {
- mContent->dec();
- }
-
- SharedPtr(const SharedPtr &other) : mContent(other.mContent)
- {
- mContent->inc();
- }
-
- SharedPtr& operator=(const SharedPtr &other)
- {
- if(mContent->get() != other.mContent->get()) {
- mContent->dec();
- mContent = other.mContent;
- mContent->inc();
- }
- return ( *this );
- }
-
- SharedPtr& operator=(ContentType *content)
- {
- mContent--;
- mContent = new CountingBodyPolicy< ContentType >(content);
- }
-
- bool operator==(const SharedPtr &other) const
- {
- return (mContent->get() == other.mContent->get());
- }
-
- bool operator!=(const SharedPtr &other) const
- {
- return (mContent->get() != other.mContent->get());
- }
-
- bool operator<(const SharedPtr &other) const
- {
- return (mContent->get() < other.mContent->get());
- }
-
- operator ContentType*()
- {
- return mContent->get();
- }
-
- ContentType& operator*()
- {
- if(mContent->get() == NULL) {
- throw std::runtime_error(NULL_BODY_ERROR);
- }
- return *mContent->get();
- }
-
- ContentType* operator->()
- {
- if(mContent->get() == NULL) {
- throw std::runtime_error(NULL_BODY_ERROR);
- }
- return mContent->get();
- }
-
- private:
- CountingBodyPolicy * mContent;
- };
-}
-
-#endif
diff --git a/sflphone-common/libs/utilspp/TypeList.hpp b/sflphone-common/libs/utilspp/TypeList.hpp
deleted file mode 100644
index 879fc364cbff18592901ba1f5f6d83eebeb68d25..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/TypeList.hpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef TYPE_LIST_HPP
-#define TYPE_LIST_HPP
-
-#include "NullType.hpp"
-
-
-
-#define TYPE_LIST_1( T1 ) utilspp::tl::TypeList< T1, utilspp::NullType >
-#define TYPE_LIST_2( T1, T2 ) ::utilspp::tl::TypeList< T1, TYPE_LIST_1( T2 ) >
-#define TYPE_LIST_3( T1, T2, T3 ) ::utilspp::tl::TypeList< T1, TYPE_LIST_2( T2, T3 ) >
-#define TYPE_LIST_4( T1, T2, T3, T4 ) ::utilspp::tl::TypeList< T1, TYPE_LIST_3( T2, T3, T4 ) >
-#define TYPE_LIST_5( T1, T2, T3, T4, T5 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_4( T2, T3, T4, T5 ) >
-#define TYPE_LIST_6( T1, T2, T3, T4, T5, T6 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_5( T2, T3, T4, T5, T6 ) >
-#define TYPE_LIST_7( T1, T2, T3, T4, T5, T6, T7 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_6( T2, T3, T4, T5, T6, T7 ) >
-#define TYPE_LIST_8( T1, T2, T3, T4, T5, T6, T7, T8 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_7( T2, T3, T4, T5, T6, T7, T8 ) >
-#define TYPE_LIST_9( T1, T2, T3, T4, T5, T6, T7, T8, T9 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_8( T2, T3, T4, T5, T6, T7, T8, T9 ) >
-#define TYPE_LIST_10( T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_9( T2, T3, T4, T5, T6, T7, T8, T9, T10 ) >
-#define TYPE_LIST_11( T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_10( T2, T3, T4, T5, T6, T7, T8, T9, T10, T11 ) >
-#define TYPE_LIST_12( T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_11( T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12 ) >
-#define TYPE_LIST_13( T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_12( T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13 ) >
-#define TYPE_LIST_14( T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_13( T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14 ) >
-#define TYPE_LIST_15( T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15 ) \
- ::utilspp::tl::TypeList< T1, TYPE_LIST_14( T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15 ) >
-
-
-namespace utilspp
-{
- namespace tl
- {
- template< class T, class U >
- struct TypeList
- {
- typedef T head;
- typedef U tail;
- };
-
- //Calculating length of TypeLists
- template< class TList >
- struct length;
-
- template<>
- struct length< NullType >
- {
- enum { value = 0 };
- };
-
- template< class T, class U >
- struct length< TypeList< T, U > >
- {
- enum { value = 1 + length< U >::value };
- };
-
- /**
- * Returns the type at a given position (zero-based)
- * in TList. If the index is greather than or equal to
- * the length of TList, a compile-time error occurs.
- */
- template< class TList, unsigned int index >
- struct TypeAt;
-
- template< class THead, class TTail >
- struct TypeAt< TypeList< THead, TTail >, 0 >
- {
- typedef THead Result;
- };
-
- template< class THead, class TTail, unsigned int i >
- struct TypeAt< TypeList< THead, TTail >, i >
- {
- typedef typename TypeAt< TTail, i - 1 >::Result Result;
- };
-
- /**
- * Returns the type at a given position (zero-based)
- * in TList. If the index is greather than or equal to
- * the length of TList, OutOfBound template class is
- * returned.
- */
- template< class TList, unsigned int index, class OutOfBound = utilspp::NullType >
- struct TypeAtNonStrict;
-
- template< class THead, class TTail, class OutOfBound >
- struct TypeAtNonStrict< TypeList< THead, TTail >, 0, OutOfBound >
- {
- typedef THead Result;
- };
-
- template< class THead, class TTail, unsigned int i, class OutOfBound >
- struct TypeAtNonStrict< TypeList< THead, TTail >, i, OutOfBound >
- {
- typedef typename TypeAtNonStrict< TTail, i - 1 >::Result Result;
- };
-
- template< unsigned int i, class OutOfBound >
- struct TypeAtNonStrict< utilspp::NullType, i , OutOfBound>
- {
- typedef OutOfBound Result;
- };
-
-
- //Searching TypeLists
- template< class TList, class T >
- struct IndexOf;
-
- template< class T >
- struct IndexOf< NullType, T >
- {
- enum { value = -1 };
- };
-
- template< class TTail, class T >
- struct IndexOf< TypeList< T, TTail >, T >
- {
- enum { value = 0 };
- };
-
- template< class THead, class TTail, class T >
- struct IndexOf< TypeList< THead, TTail >, T >
- {
- private:
- enum { temp = IndexOf< TTail, T >::value };
-
- public:
- enum { value = temp == -1 ? -1 : 1 + temp };
- };
-
- //Appending to TypeLists
- template< class TList, class T >
- struct append;
-
- template <>
- struct append< NullType, NullType >
- {
- typedef NullType Result;
- };
-
- template< class T >
- struct append< NullType, T >
- {
- typedef TYPE_LIST_1( T ) Result;
- };
-
- template< class THead, class TTail >
- struct append< NullType, TypeList< THead, TTail > >
- {
- typedef TypeList< THead, TTail > Result;
- };
-
- template < class THead, class TTail, class T >
- struct append< TypeList< THead, TTail >, T >
- {
- typedef TypeList< THead, typename append< TTail, T >::Result >
- Result;
- };
-
- //Erasing a type from a TypeList
- template< class TList, class T >
- struct erase;
-
- template< class T >
- struct erase< NullType, T >
- {
- typedef NullType Result;
- };
-
- template< class T, class TTail >
- struct erase< TypeList< T, TTail >, T >
- {
- typedef TTail Result;
- };
-
- template< class THead, class TTail, class T >
- struct erase< TypeList< THead, TTail >, T >
- {
- typedef TypeList< THead, typename erase< TTail, T >::Result >
- Result;
- };
- };
-}
-
-
-#endif
-
diff --git a/sflphone-common/libs/utilspp/TypeTrait.hpp b/sflphone-common/libs/utilspp/TypeTrait.hpp
deleted file mode 100644
index 926b197f9eba480c80b382b0ee1cd43c7b53621d..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/TypeTrait.hpp
+++ /dev/null
@@ -1,916 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_TYPETRAIT_HPP
-#define UTILSPP_TYPETRAIT_HPP
-
-#include "NullType.hpp"
-
-namespace utilspp
-{
- template< typename T >
- class TypeTrait
- {
- private:
- template< typename U >
- struct unreference
- {
- typedef U type;
- };
-
- template< typename U >
- struct unreference< U & >
- {
- typedef U type;
- };
-
- template< typename U >
- struct unconst
- {
- typedef U type;
- };
-
- template< typename U >
- struct unconst< const U >
- {
- typedef U type;
- };
-
- public:
- typedef typename unreference< T >::type NonReference;
- typedef typename unconst< T >::type NonConst;
- typedef typename unconst< unreference< T >::type >::type NonParam;
- };
-
- template< class T >
- struct PointerOnMemberFunction
- {
- typedef utilspp::NullType ClassType;
- typedef utilspp::NullType ReturnType;
- typedef utilspp::NullType Param1Type;
- typedef utilspp::NullType Param2Type;
- typedef utilspp::NullType Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef utilspp::NullType ParamList;
- };
-
- template< typename V, typename W >
- struct PointerOnMemberFunction< W(V::*)() >
- {
- typedef V ClassType;
- typedef W ReturnType;
-
- typedef utilspp::NullType Param1Type;
- typedef utilspp::NullType Param2Type;
- typedef utilspp::NullType Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef utilspp::NullType ParamList;
- };
-
- template< typename V, typename W, typename X >
- struct PointerOnMemberFunction< W(V::*)(X) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X ParamType;
- typedef utilspp::NullType Param2Type;
- typedef utilspp::NullType Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_1(X) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y >
- struct PointerOnMemberFunction< W(V::*)(X, Y) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X ParamType;
- typedef Y Param2Type;
- typedef utilspp::NullType Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_2(X, Y) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X ParamType;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_3(X, Y, Z) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X ParamType;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_3(X, Y, Z) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X ParamType;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_3(X, Y, Z) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X ParamType;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_4(X, Y, Z, A) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X ParamType;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_5(X, Y, Z, A, B) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_6(X, Y, Z, A, B, C) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_7(X, Y, Z, A, B, C, D) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D, E) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef E Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_8(X, Y, Z, A, B, C, D, E) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D, E, F) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef E Param8Type;
- typedef F Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_9(X, Y, Z, A, B, C, D, E, F) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D, E, F, G) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef E Param8Type;
- typedef F Param9Type;
- typedef G Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_10(X, Y, Z, A, B, C, D, E, F, G) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D, E, F, G, H) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef E Param8Type;
- typedef F Param9Type;
- typedef G Param10Type;
- typedef H Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_11(X, Y, Z, A, B, C, D, E, F, G, H) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D, E, F, G, H, I) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef E Param8Type;
- typedef F Param9Type;
- typedef G Param10Type;
- typedef H Param11Type;
- typedef I Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_12(X, Y, Z, A, B, C, D, E, F, G, H, I) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D, E, F, G, H, I, J) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef E Param8Type;
- typedef F Param9Type;
- typedef G Param10Type;
- typedef H Param11Type;
- typedef I Param12Type;
- typedef J Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_13(X, Y, Z, A, B, C, D, E, F, G, H, I, J) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D, E, F, G, H, I, J, K) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef E Param8Type;
- typedef F Param9Type;
- typedef G Param10Type;
- typedef H Param11Type;
- typedef I Param12Type;
- typedef J Param13Type;
- typedef K Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_14(X, Y, Z, A, B, C, D, E, F, G, H, I, J, K) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K, typename L >
- struct PointerOnMemberFunction< W(V::*)(X, Y, Z, A, B, C, D, E, F, G, H, I, J, K, L) >
- {
- typedef V ClassType;
- typedef W ReturnType;
- typedef X Param1Type;
- typedef Y Param2Type;
- typedef Z Param3Type;
- typedef A Param4Type;
- typedef B Param5Type;
- typedef C Param6Type;
- typedef D Param7Type;
- typedef E Param8Type;
- typedef F Param9Type;
- typedef G Param10Type;
- typedef H Param11Type;
- typedef I Param12Type;
- typedef J Param13Type;
- typedef K Param14Type;
- typedef L Param15Type;
-
- typedef TYPE_LIST_15(X, Y, Z, A, B, C, D, E, F, G, H, I, J, K, L) ParamList;
- };
-
- template< typename T >
- struct PointerOnFunction
- {
- typedef utilspp::NullType ReturnType;
-
- typedef utilspp::NullType Param1Type;
- typedef utilspp::NullType Param2Type;
- typedef utilspp::NullType Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef utilspp::NullType ParamList;
- };
-
- template< typename V >
- struct PointerOnFunction< V(*)() >
- {
- typedef V ReturnType;
- typedef utilspp::NullType Param1Type;
- typedef utilspp::NullType Param2Type;
- typedef utilspp::NullType Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef utilspp::NullType ParamList;
- };
-
- template< typename V, typename W >
- struct PointerOnFunction< V(*)(W) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef utilspp::NullType Param2Type;
- typedef utilspp::NullType Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_1(W) ParamList;
- };
-
- template< typename V, typename W, typename X >
- struct PointerOnFunction< V(*)(W, X) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef utilspp::NullType Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_2(W, X) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y >
- struct PointerOnFunction< V(*)(W, X, Y) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef utilspp::NullType Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_3(W, X, Y) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z >
- struct PointerOnFunction< V(*)(W, X, Y, Z) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef utilspp::NullType Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_4(W, X, Y, Z) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef utilspp::NullType Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_5(W, X, Y, Z, A) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef utilspp::NullType Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_6(W, X, Y, Z, A, B) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef utilspp::NullType Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_7(W, X, Y, Z, A, B, C) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C, D) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef D Param8Type;
- typedef utilspp::NullType Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_8(W, X, Y, Z, A, B, C, D) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C, D, E) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef D Param8Type;
- typedef E Param9Type;
- typedef utilspp::NullType Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_9(W, X, Y, Z, A, B, C, D, E) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C, D, E, F) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef D Param8Type;
- typedef E Param9Type;
- typedef F Param10Type;
- typedef utilspp::NullType Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_10(W, X, Y, Z, A, B, C, D, E, F) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C, D, E, F, G) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef D Param8Type;
- typedef E Param9Type;
- typedef F Param10Type;
- typedef G Param11Type;
- typedef utilspp::NullType Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_11(W, X, Y, Z, A, B, C, D, E, F, G) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C, D, E, F, G, H) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef D Param8Type;
- typedef E Param9Type;
- typedef F Param10Type;
- typedef G Param11Type;
- typedef H Param12Type;
- typedef utilspp::NullType Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_12(W, X, Y, Z, A, B, C, D, E, F, G, H) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C, D, E, F, G, H, I) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef D Param8Type;
- typedef E Param9Type;
- typedef F Param10Type;
- typedef G Param11Type;
- typedef H Param12Type;
- typedef I Param13Type;
- typedef utilspp::NullType Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_13(W, X, Y, Z, A, B, C, D, E, F, G, H, I ) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C, D, E, F, G, H, I, J) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef D Param8Type;
- typedef E Param9Type;
- typedef F Param10Type;
- typedef G Param11Type;
- typedef H Param12Type;
- typedef I Param13Type;
- typedef J Param14Type;
- typedef utilspp::NullType Param15Type;
-
- typedef TYPE_LIST_14(W, X, Y, Z, A, B, C, D, E, F, G, H, I, J ) ParamList;
- };
-
- template< typename V, typename W, typename X, typename Y, typename Z, typename A, typename B, typename C, typename D, typename E, typename F, typename G, typename H, typename I, typename J, typename K >
- struct PointerOnFunction< V(*)(W, X, Y, Z, A, B, C, D, E, F, G, H, I, J, K) >
- {
- typedef V ReturnType;
- typedef W Param1Type;
- typedef X Param2Type;
- typedef Y Param3Type;
- typedef Z Param4Type;
- typedef A Param5Type;
- typedef B Param6Type;
- typedef C Param7Type;
- typedef D Param8Type;
- typedef E Param9Type;
- typedef F Param10Type;
- typedef G Param11Type;
- typedef H Param12Type;
- typedef I Param13Type;
- typedef J Param14Type;
- typedef K Param15Type;
-
- typedef TYPE_LIST_15(W, X, Y, Z, A, B, C, D, E, F, G, H, I, J, K) ParamList;
- };
-
-}
-
-#endif
diff --git a/sflphone-common/libs/utilspp/functor/Binder.hpp b/sflphone-common/libs/utilspp/functor/Binder.hpp
deleted file mode 100644
index 6bd34cfe36e0f91fb42a38b2f4cd1f6d19c3f4d7..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/functor/Binder.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CURLPP_BINDER_HPP
-#define CURLPP_BINDER_HPP
-
-namespace utilspp
-{
- template< typename Incoming >
- class BinderFirst : FunctorImpl< typename Incoming::ResultType,
- typename Incoming::ParamList::Tail >
- {
- typedef utilspp::Functor< typename Incoming::ResultType, typename Incoming::ParamList::Tail > Outgoing;
- typedef typename Incoming::Parm1 Bound;
- typedef typename Incoming::ResultType ResultType;
-
- public:
- BinderFirst(const Incoming& fun, Bound bound)
- : mFun(fun), mBound(bound)
- {}
-
- BinderFirst* clone() const
- {return new BinderFirst(*this);}
-
- ResultType operator()()
- {return mFun(mBound)();}
-
- ResultType operator()(typename Outgoing::Parm1 p1)
- {return mFun(mBound, p1);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2)
- {return mFun(mBound, p1, p2);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3)
- {return mFun(mBound, p1, p2, p3);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4)
- {return mFun(mBound, p1, p2, p3, p4);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5)
- {return mFun(mBound, p1, p2, p3, p4, p5);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6, typename Outgoing::Parm7 p7)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6, p7);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6, typename Outgoing::Parm7 p7, typename Outgoing::Parm8 p8)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6, p7, p8);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6, typename Outgoing::Parm7 p7, typename Outgoing::Parm8 p8, typename Outgoing::Parm9 p9)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6, p7, p8, p9);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6, typename Outgoing::Parm7 p7, typename Outgoing::Parm8 p8, typename Outgoing::Parm9 p9, typename Outgoing::Parm10 p10)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6, typename Outgoing::Parm7 p7, typename Outgoing::Parm8 p8, typename Outgoing::Parm9 p9, typename Outgoing::Parm10 p10, typename Outgoing::Parm11 p11)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6, typename Outgoing::Parm7 p7, typename Outgoing::Parm8 p8, typename Outgoing::Parm9 p9, typename Outgoing::Parm10 p10, typename Outgoing::Parm11 p11, typename Outgoing::Parm12 p12)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6, typename Outgoing::Parm7 p7, typename Outgoing::Parm8 p8, typename Outgoing::Parm9 p9, typename Outgoing::Parm10 p10, typename Outgoing::Parm11 p11, typename Outgoing::Parm12 p12, typename Outgoing::Parm13 p13)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);}
-
- ResultType operator()(typename Outgoing::Parm1 p1, typename Outgoing::Parm2 p2, typename Outgoing::Parm3 p3, typename Outgoing::Parm4 p4, typename Outgoing::Parm5 p5, typename Outgoing::Parm6 p6, typename Outgoing::Parm7 p7, typename Outgoing::Parm8 p8, typename Outgoing::Parm9 p9, typename Outgoing::Parm10 p10, typename Outgoing::Parm11 p11, typename Outgoing::Parm12 p12, typename Outgoing::Parm13 p13, typename Outgoing::Parm14 p14)
- {return mFun(mBound, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14);}
-
- private:
- Incoming mFun;
- Bound mBound;
- };
-
- template< typename R, class TList >
- Functor<R, typename TList::Tail> BindFirst(const Functor<R, TList>& fun,
- typename TList::THead bound);
-};
-
-#include "Binder.inl"
-
-#endif
diff --git a/sflphone-common/libs/utilspp/functor/Binder.inl b/sflphone-common/libs/utilspp/functor/Binder.inl
deleted file mode 100644
index a2167a9aaf426a2ab4bc4cd011a1eff34f215631..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/functor/Binder.inl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef CURLPP_BINDER_HPP
-#define CURLPP_BINDER_HPP
-
-template< R, class TList >
-utilspp::Functor<R, typename TList::Tail> BindFirst(const Functor<R, TList>& fun,
- TList::Head bound)
-{
- typedef Functor< R, TList > Incoming;
- typedef Functor< R, typename TList::Tail > Outgoing;
-
- return Outgoing(std::auto_ptr<
- typename Outgoing::Impl >(new BinderFirst< Incoming >(fun, bound)));
-}
-
-#endif
-
diff --git a/sflphone-common/libs/utilspp/functor/Functor.hpp b/sflphone-common/libs/utilspp/functor/Functor.hpp
deleted file mode 100644
index e6255fadd281834f7eaa220197c7e4efe0da19e1..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/functor/Functor.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_FUNCTOR_HPP
-#define UTILSPP_FUNCTOR_HPP
-
-#include <memory>
-
-#include "../NullType.hpp"
-#include "../EmptyType.hpp"
-#include "../TypeList.hpp"
-
-#include "FunctorImpl.hpp"
-#include "FunctorHandler.hpp"
-#include "MemFunHandler.hpp"
-
-namespace utilspp
-{
- template< typename R, class TList >
- class Functor
- {
- public:
- typedef R ResultType;
- typedef TList ParmList;
-
- Functor(const Functor &functor);
- Functor& operator=(const Functor &functor);
- //explicit Functor(std::auto_ptr< Impl > impl);
- template< class Fun >
- Functor(Fun fun);
- template< class PointerToObj, class MemFun >
- Functor(const PointerToObj &obj, MemFun fun);
-
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 0, utilspp::EmptyType >::Result Parm1;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 1, utilspp::EmptyType >::Result Parm2;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 2, utilspp::EmptyType >::Result Parm3;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 3, utilspp::EmptyType >::Result Parm4;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 4, utilspp::EmptyType >::Result Parm5;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 5, utilspp::EmptyType >::Result Parm6;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 6, utilspp::EmptyType >::Result Parm7;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 7, utilspp::EmptyType >::Result Parm8;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 8, utilspp::EmptyType >::Result Parm9;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 9, utilspp::EmptyType >::Result Parm10;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 10, utilspp::EmptyType >::Result Parm11;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 11, utilspp::EmptyType >::Result Parm12;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 12, utilspp::EmptyType >::Result Parm13;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 13, utilspp::EmptyType >::Result Parm14;
- typedef typename utilspp::tl::TypeAtNonStrict< TList, 14, utilspp::EmptyType >::Result Parm15;
-
- R operator()()
- {return (*mImpl)();}
-
- R operator()(Parm1 p1)
- {return (*mImpl)(p1);}
-
- R operator()(Parm1 p1, Parm2 p2)
- {return (*mImpl)(p1, p2);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3)
- {return (*mImpl)(p1, p2, p3);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4)
- {return (*mImpl)(p1, p2, p3, p4);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5)
- {return (*mImpl)(p1, p2, p3, p4, p5);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7, Parm8 p8)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7, p8);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7, Parm8 p8, Parm9 p9)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7, p8, p9);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7, Parm8 p8, Parm9 p9, Parm10 p10)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7, Parm8 p8, Parm9 p9, Parm10 p10, Parm11 p11)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7, Parm8 p8, Parm9 p9, Parm10 p10, Parm11 p11, Parm12 p12)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7, Parm8 p8, Parm9 p9, Parm10 p10, Parm11 p11, Parm12 p12, Parm13 p13)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7, Parm8 p8, Parm9 p9, Parm10 p10, Parm11 p11, Parm12 p12, Parm13 p13, Parm14 p14)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14);}
-
- R operator()(Parm1 p1, Parm2 p2, Parm3 p3, Parm4 p4, Parm5 p5, Parm6 p6, Parm7 p7, Parm8 p8, Parm9 p9, Parm10 p10, Parm11 p11, Parm12 p12, Parm13 p13, Parm14 p14, Parm15 p15)
- {return (*mImpl)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15);}
-
- private:
- typedef FunctorImpl< R, TList > Impl;
- std::auto_ptr<Impl> mImpl;
- };
-
-
-};
-
-#include "Functor.inl"
-#include "Binder.hpp"
-
-#endif
diff --git a/sflphone-common/libs/utilspp/functor/Functor.inl b/sflphone-common/libs/utilspp/functor/Functor.inl
deleted file mode 100644
index f996ce814e5d9d23905a59ea62a1505bb092acee..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/functor/Functor.inl
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_FUNCTOR_INL
-#define UTILSPP_FUNCTOR_INL
-
-template <typename R, class TList>
-template <typename Fun>
-utilspp::Functor<R, TList>::Functor(Fun fun)
-: mImpl(new FunctorHandler< Functor, Fun >(fun))
-{}
-
-template <typename R, class TList>
-template <typename PointerToObj, typename MemFun>
-utilspp::Functor<R, TList>::Functor(const PointerToObj &obj, MemFun fun)
-: mImpl(new MemFunHandler< Functor, PointerToObj, MemFun >(obj, fun))
-{}
-
-template <typename R, class TList>
-utilspp::Functor<R, TList>::Functor(const Functor &functor)
-: mImpl(functor.mImpl->clone())
-{}
-
-template <typename R, class TList>
-utilspp::Functor<R, TList> &
-utilspp::Functor<R, TList>::operator=(const Functor &functor)
-{
- mImpl = std::auto_ptr< Impl >(functor.mImpl->clone());
- return (*this);
-}
-
-#endif
-
diff --git a/sflphone-common/libs/utilspp/functor/FunctorHandler.hpp b/sflphone-common/libs/utilspp/functor/FunctorHandler.hpp
deleted file mode 100644
index 5556e8d56c6c604e469fa28ef0dc6bdc0bf1c69e..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/functor/FunctorHandler.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_FUNCTORHANDLER_HPP
-#define UTILSPP_FUNCTORHANDLER_HPP
-
-namespace utilspp
-{
- template <class ParentFunctor, typename Fun>
- class FunctorHandler : public FunctorImpl< typename ParentFunctor::ResultType,
- typename ParentFunctor::ParmList >
- {
- public:
- typedef typename ParentFunctor::ResultType ResultType;
-
- FunctorHandler(Fun fun) : mFun(fun) {}
- FunctorHandler* clone() const
- {return new FunctorHandler(*this);}
-
- ResultType operator()()
- {return mFun();}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1)
- {return (mFun)(p1);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2)
- {return (mFun)(p1, p2);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3)
- {return (mFun)(p1, p2, p3);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4)
- {return (mFun)(p1, p2, p3, p4);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5)
- {return (mFun)(p1, p2, p3, p4, p5);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6)
- {return (mFun)(p1, p2, p3, p4, p5, p6);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7, p8);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7, p8, p9);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11, typename ParentFunctor::Parm12 p12)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11, typename ParentFunctor::Parm12 p12, typename ParentFunctor::Parm13 p13)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11, typename ParentFunctor::Parm12 p12, typename ParentFunctor::Parm13 p13, typename ParentFunctor::Parm14 p14)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11, typename ParentFunctor::Parm12 p12, typename ParentFunctor::Parm13 p13, typename ParentFunctor::Parm14 p14, typename ParentFunctor::Parm15 p15)
- {return (mFun)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15);}
-
- private:
- Fun mFun;
- };
-};
-
-#endif
-
-
diff --git a/sflphone-common/libs/utilspp/functor/FunctorImpl.hpp b/sflphone-common/libs/utilspp/functor/FunctorImpl.hpp
deleted file mode 100644
index 93f59716fddb77bbb48d8013f6c4805edb59bbb3..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/functor/FunctorImpl.hpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_FUNCTORIMPL_HPP
-#define UTILSPP_FUNCTORIMPL_HPP
-
-namespace utilspp
-{
- template< typename R, class TList >
- struct FunctorImpl;
-
- template< typename R >
- struct FunctorImpl<R, utilspp::NullType >
- {
- R operator()() = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1 >
- struct FunctorImpl<R, TYPE_LIST_1(P1) >
- {
- virtual R operator()(P1) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2 >
- struct FunctorImpl<R, TYPE_LIST_2(P1, P2) >
- {
- virtual R operator()(P1, P2) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2, typename P3 >
- struct FunctorImpl<R, TYPE_LIST_3(P1, P2, P3) >
- {
- virtual R operator()(P1, P2, P3) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2, typename P3, typename P4 >
- struct FunctorImpl<R, TYPE_LIST_4(P1, P2, P3, P4) >
- {
- virtual R operator()(P1, P2, P3, P4) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2, typename P3, typename P4, typename P5 >
- struct FunctorImpl<R, TYPE_LIST_5(P1, P2, P3, P4, P5) >
- {
- virtual R operator()(P1, P2, P3, P4, P5) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template<
- typename R,
- typename P1,
- typename P2,
- typename P3,
- typename P4,
- typename P5,
- typename P6 >
- struct FunctorImpl<R, TYPE_LIST_6(P1, P2, P3, P4, P5, P6) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template<
- typename R,
- typename P1,
- typename P2,
- typename P3,
- typename P4,
- typename P5,
- typename P6,
- typename P7 >
- struct FunctorImpl<R, TYPE_LIST_7(P1, P2, P3, P4, P5, P6, P7) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template<
- typename R,
- typename P1,
- typename P2,
- typename P3,
- typename P4,
- typename P5,
- typename P6,
- typename P7,
- typename P8 >
- struct FunctorImpl<R, TYPE_LIST_8(P1, P2, P3, P4, P5, P6, P7, P8) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7, P8) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template<
- typename R,
- typename P1,
- typename P2,
- typename P3,
- typename P4,
- typename P5,
- typename P6,
- typename P7,
- typename P8,
- typename P9 >
- struct FunctorImpl<R, TYPE_LIST_9(P1, P2, P3, P4, P5, P6, P7, P8, P9) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7, P8, P9) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template<
- typename R,
- typename P1,
- typename P2,
- typename P3,
- typename P4,
- typename P5,
- typename P6,
- typename P7,
- typename P8,
- typename P9,
- typename P10 >
- struct FunctorImpl<R, TYPE_LIST_10(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11 >
- struct FunctorImpl<R, TYPE_LIST_11(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11, typename P12 >
- struct FunctorImpl<R, TYPE_LIST_12(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11, typename P12, typename P13 >
- struct FunctorImpl<R, TYPE_LIST_13(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11, typename P12, typename P13, typename P14 >
- struct FunctorImpl<R, TYPE_LIST_14(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-
- template< typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11, typename P12, typename P13, typename P14, typename P15 >
- struct FunctorImpl<R, TYPE_LIST_15(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15) >
- {
- virtual R operator()(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15) = 0;
- virtual FunctorImpl *clone() const = 0;
- virtual ~FunctorImpl(){};
- };
-};
-
-#endif
diff --git a/sflphone-common/libs/utilspp/functor/Makefile.am b/sflphone-common/libs/utilspp/functor/Makefile.am
deleted file mode 100644
index 0ca9eff77d01187ddd28ab87c57383c4a5e7921b..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/functor/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-#pkginclude_HEADERS = \
-# Binder.hpp Binder.inl \
-# FunctorHandler.hpp \
-# Functor.hpp \
-# FunctorImpl.hpp \
-# Functor.inl \
-# MemFunHandler.hpp
-
-#pkgincludedir=$(includedir)/utilspp/functor
diff --git a/sflphone-common/libs/utilspp/functor/MemFunHandler.hpp b/sflphone-common/libs/utilspp/functor/MemFunHandler.hpp
deleted file mode 100644
index 2e92cee85b86850266bf46f043526f352adae6b1..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/utilspp/functor/MemFunHandler.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_MEMFUNHANDLER_HPP
-#define UTILSPP_MEMFUNHANDLER_HPP
-
-namespace utilspp
-{
- template <class ParentFunctor, typename PointerToObj, typename PointerToMemFn>
- class MemFunHandler : public FunctorImpl< typename ParentFunctor::ResultType,
- typename ParentFunctor::ParmList >
- {
- public:
- typedef typename ParentFunctor::ResultType ResultType;
- MemFunHandler(PointerToObj obj, PointerToMemFn memFn)
- : mObj(obj)
- , mMemFn(memFn)
- {}
-
- MemFunHandler* clone() const
- {return new MemFunHandler(*this);}
-
- ResultType operator()()
- {return ((*mObj).*mMemFn)();}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1)
- {return ((*mObj).*mMemFn)(p1);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2)
- {return ((*mObj).*mMemFn)(p1, p2);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1,
- typename ParentFunctor::Parm2 p2,
- typename ParentFunctor::Parm3 p3)
- {return ((*mObj).*mMemFn)(p1, p2, p3);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7, p8);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7, p8, p9);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11, typename ParentFunctor::Parm12 p12)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11, typename ParentFunctor::Parm12 p12, typename ParentFunctor::Parm13 p13)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11, typename ParentFunctor::Parm12 p12, typename ParentFunctor::Parm13 p13, typename ParentFunctor::Parm14 p14)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14);}
-
- ResultType operator()(typename ParentFunctor::Parm1 p1, typename ParentFunctor::Parm2 p2, typename ParentFunctor::Parm3 p3, typename ParentFunctor::Parm4 p4, typename ParentFunctor::Parm5 p5, typename ParentFunctor::Parm6 p6, typename ParentFunctor::Parm7 p7, typename ParentFunctor::Parm8 p8, typename ParentFunctor::Parm9 p9, typename ParentFunctor::Parm10 p10, typename ParentFunctor::Parm11 p11, typename ParentFunctor::Parm12 p12, typename ParentFunctor::Parm13 p13, typename ParentFunctor::Parm14 p14, typename ParentFunctor::Parm15 p15)
- {return ((*mObj).*mMemFn)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15);}
-
- private:
- PointerToObj mObj;
- PointerToMemFn mMemFn;
- };
-};
-
-#endif
-
diff --git a/sflphone-common/test/Makefile.am b/sflphone-common/test/Makefile.am
index c95764ebfdd82887c4f8a2b396762ee0cc9962a4..42741e2b361b03c89d7c8bed0c15e9935a852112 100644
--- a/sflphone-common/test/Makefile.am
+++ b/sflphone-common/test/Makefile.am
@@ -48,7 +48,6 @@ LLIBS=$(CPPUNIT_LIBS) \
../src/sflphoned-eventthread.o \
../src/sflphoned-managerimpl_registration.o \
../src/sflphoned-numbercleaner.o \
- ../src/sflphoned-observer.o \
../src/sflphoned-voiplink.o \
../src/sflphoned-preferences.o \
../src/libsflphone.la