// $Id$
//
// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
#include <boost/preprocessor/repetition/enum_shifted.hpp>
#include <boost/preprocessor/iteration/iterate.hpp>
-template <typename R, typename T>
-boost::function<R()> membind(R (T::* fn)(),scOBTYPE ob)
+template <typename R, typename T1, typename T2>
+boost::function<R()> membind(R (T1::* fn)(),T2 scOBTYPE ob)
{
- return boost::bind(fn,ob);
+ return boost::bind(fn,static_cast<T1 scOBTYPE>(ob));
+}
+
+template <typename R, typename T1, typename T2>
+boost::function<R()> membind(R (T1::* fn)() const, T2 const scOBTYPE ob)
+{
+ return boost::bind(fn,static_cast<T1 const scOBTYPE>(ob));
+}
+
+template <typename R, typename T1, typename T2>
+boost::function<R()> membind(R (T1::* fn)() const, T2 scOBTYPE ob)
+{
+ return boost::bind(fn,static_cast<T1 const scOBTYPE>(ob));
}
// for BOOST_PP_ITERATION() in 2..9 do
-#define BOOST_PP_ITERATION_PARAMS_1 (4, (2, 9, "Utils/impl/membind.hh", 1))
+#define BOOST_PP_ITERATION_PARAMS_1 (4, (2, 9, SENF_ABSOLUTE_INCLUDE_PATH(Utils/impl/membind.hh), 1))
#include BOOST_PP_ITERATE()
#elif BOOST_PP_ITERATION_DEPTH()==1 && BOOST_PP_ITERATION_FLAGS()==1
// {{
#define scARG(z,n,d) BOOST_PP_CAT(d,n)
#define scPARAMS(d) BOOST_PP_ENUM_SHIFTED(BOOST_PP_ITERATION(),scARG,d)
-template < typename R, typename T, scPARAMS(typename A) >
+template < typename R, typename T1, typename T2, scPARAMS(typename A) >
+boost::function<R ( scPARAMS(A) )>
+membind(R (T1::* fn)( scPARAMS(A) ), T2 scOBTYPE ob)
+{
+ return boost::bind(fn, static_cast<T1 scOBTYPE>(ob), scPARAMS(_) );
+}
+
+template < typename R, typename T1, typename T2, scPARAMS(typename A) >
+boost::function<R ( scPARAMS(A) )>
+membind(R (T1::* fn)( scPARAMS(A) ) const, T2 const scOBTYPE ob)
+{
+ return boost::bind(fn, static_cast<T1 const scOBTYPE>(ob), scPARAMS(_) );
+}
+
+template < typename R, typename T1, typename T2, scPARAMS(typename A) >
boost::function<R ( scPARAMS(A) )>
-membind(R (T::* fn)( scPARAMS(A) ), scOBTYPE ob)
+membind(R (T1::* fn)( scPARAMS(A) ) const, T2 scOBTYPE ob)
{
- return boost::bind(fn, ob, scPARAMS(_) );
+ return boost::bind(fn, static_cast<T1 const scOBTYPE>(ob), scPARAMS(_) );
}
#undef scPARAMS
// indent-tabs-mode: nil
// ispell-local-dictionary: "american"
// compile-command: "scons -u test"
+// comment-column: 40
// End: