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/promote.hpp b/ndnboost/type_traits/promote.hpp
new file mode 100644
index 0000000..06065f6
--- /dev/null
+++ b/ndnboost/type_traits/promote.hpp
@@ -0,0 +1,40 @@
+// 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_promote_hpp_INCLUDED
+#define FILE_boost_type_traits_promote_hpp_INCLUDED
+
+#include <ndnboost/config.hpp>
+#include <ndnboost/type_traits/integral_promotion.hpp>
+#include <ndnboost/type_traits/floating_point_promotion.hpp>
+
+// Should be the last #include
+#include <ndnboost/type_traits/detail/type_trait_def.hpp>
+
+namespace ndnboost {
+
+namespace detail {
+
+template<class T>
+struct promote_impl
+ : public integral_promotion<
+ BOOST_DEDUCED_TYPENAME floating_point_promotion<T>::type
+ >
+{
+};
+
+}
+
+BOOST_TT_AUX_TYPE_TRAIT_DEF1(
+ promote
+ , T
+ , BOOST_DEDUCED_TYPENAME ndnboost::detail::promote_impl<T>::type
+ )
+}
+
+#include <ndnboost/type_traits/detail/type_trait_undef.hpp>
+
+#endif // #ifndef FILE_boost_type_traits_promote_hpp_INCLUDED
+