commit a28eed8ca42271ce9b4cbab94abd2bbe84f022f1
author Jeff Thompson <jefft0@gmail.com> Thu Aug 22 16:21:10 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Thu Aug 22 16:21:10 2013 -0700
tree 97aa34d4af6fe1d870e303316b422c90215b94bb
parent c967108e2fbc1ff85b2e8822c510c6b08cdcd650

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.

ndnboost/smart_ptr/shared_ptr.hpp

diff --git a/ndnboost/smart_ptr/shared_ptr.hpp b/ndnboost/smart_ptr/shared_ptr.hpp
index 78d6e30..52b9acc 100644
--- a/ndnboost/smart_ptr/shared_ptr.hpp
+++ b/ndnboost/smart_ptr/shared_ptr.hpp
@@ -485,7 +485,7 @@
 
 #endif // BOOST_NO_AUTO_PTR
 
-#if !defined( BOOST_NO_CXX11_SMART_PTR )
+#if !defined( BOOST_NO_CXX11_SMART_PTR ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
 
     template< class Y, class D >
     shared_ptr( std::unique_ptr< Y, D > && r ): px( r.get() ), pn()
@@ -550,7 +550,7 @@
 
 #endif // BOOST_NO_AUTO_PTR
 
-#if !defined( BOOST_NO_CXX11_SMART_PTR )
+#if !defined( BOOST_NO_CXX11_SMART_PTR ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
 
     template<class Y, class D>
     shared_ptr & operator=( std::unique_ptr<Y, D> && r )