In common.h, define func_lib for function objects. In configure.ac, define HAVE_STD_FUNCTION and HAVE_BOOST_FUNCTION. Include function headers in ndnboost.
diff --git a/ndnboost/type_traits/floating_point_promotion.hpp b/ndnboost/type_traits/floating_point_promotion.hpp
new file mode 100644
index 0000000..a5a5861
--- /dev/null
+++ b/ndnboost/type_traits/floating_point_promotion.hpp
@@ -0,0 +1,91 @@
+// Copyright 2005 Alexander Nasonov.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef FILE_boost_type_traits_floating_point_promotion_hpp_INCLUDED
+#define FILE_boost_type_traits_floating_point_promotion_hpp_INCLUDED
+
+#include <ndnboost/config.hpp>
+
+#ifdef BOOST_NO_CV_SPECIALIZATIONS
+#include <ndnboost/mpl/at.hpp>
+#include <ndnboost/mpl/int.hpp>
+#include <ndnboost/mpl/multiplies.hpp>
+#include <ndnboost/mpl/plus.hpp>
+#include <ndnboost/mpl/vector.hpp>
+#include <ndnboost/type_traits/is_same.hpp>
+#endif
+
+// Should be the last #include
+#include <ndnboost/type_traits/detail/type_trait_def.hpp>
+
+namespace ndnboost {
+
+namespace type_traits { namespace detail {
+
+#ifndef BOOST_NO_CV_SPECIALIZATIONS
+
+template<class T>
+struct floating_point_promotion
+{
+ typedef T type;
+};
+
+template<>
+struct floating_point_promotion<float>
+{
+ typedef double type;
+};
+
+template<>
+struct floating_point_promotion<float const>
+{
+ typedef double const type;
+};
+
+template<>
+struct floating_point_promotion<float volatile>
+{
+ typedef double volatile type;
+};
+
+template<>
+struct floating_point_promotion<float const volatile>
+{
+ typedef double const volatile type;
+};
+
+#else
+
+template<class T>
+struct floating_point_promotion
+ : mpl::at<
+ mpl::vector< T, double, double const, double volatile,
+ double const volatile >
+ , mpl::plus<
+ is_same<T, float>
+ , mpl::multiplies< is_same<T, float const> , mpl::int_<2> >
+ , mpl::multiplies< is_same<T, float volatile> , mpl::int_<3> >
+ , mpl::multiplies< is_same<T, float const volatile>, mpl::int_<4> >
+ >
+ >
+{
+};
+
+#endif
+
+} }
+
+BOOST_TT_AUX_TYPE_TRAIT_DEF1(
+ floating_point_promotion
+ , T
+ , BOOST_DEDUCED_TYPENAME
+ ndnboost::type_traits::detail::floating_point_promotion<T>::type
+ )
+}
+
+#include <ndnboost/type_traits/detail/type_trait_undef.hpp>
+
+#endif // #ifndef FILE_boost_type_traits_floating_point_promotion_hpp_INCLUDED
+