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/smart_ptr/detail/make_array_helper.hpp b/ndnboost/smart_ptr/detail/make_array_helper.hpp
index e989f22..1105137 100644
--- a/ndnboost/smart_ptr/detail/make_array_helper.hpp
+++ b/ndnboost/smart_ptr/detail/make_array_helper.hpp
@@ -31,9 +31,9 @@
struct rebind {
typedef make_array_helper<T[], U> other;
};
- make_array_helper(std::size_t size, T** data)
- : size(sizeof(T) * size),
- data(data) {
+ make_array_helper(std::size_t size_, T** data_)
+ : size(sizeof(T) * size_),
+ data(data_) {
}
template<class U>
make_array_helper(const make_array_helper<T[], U>& other)
@@ -72,7 +72,7 @@
memory->~Y();
}
template<typename U>
- bool operator==(const make_array_helper<T[], U>& other) const {
+ bool operator==(const make_array_helper<T[], U>&) const {
return true;
}
template<typename U>
@@ -99,8 +99,8 @@
struct rebind {
typedef make_array_helper<T[N], U> other;
};
- make_array_helper(T** data)
- : data(data) {
+ make_array_helper(T** data_)
+ : data(data_) {
}
template<class U>
make_array_helper(const make_array_helper<T[N], U>& other)
@@ -138,7 +138,7 @@
memory->~Y();
}
template<typename U>
- bool operator==(const make_array_helper<T[N], U>& other) const {
+ bool operator==(const make_array_helper<T[N], U>&) const {
return true;
}
template<typename U>