ndnboost: Also rename BOOST_ to NDNBOOST_
diff --git a/include/ndnboost/utility/in_place_factory.hpp b/include/ndnboost/utility/in_place_factory.hpp
index f849649..cc077dd 100644
--- a/include/ndnboost/utility/in_place_factory.hpp
+++ b/include/ndnboost/utility/in_place_factory.hpp
@@ -10,8 +10,8 @@
 // You are welcome to contact the author at:
 //  fernando_cacciola@hotmail.com
 //
-#ifndef BOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
-#ifndef BOOST_PP_IS_ITERATING
+#ifndef NDNBOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
+#ifndef NDNBOOST_PP_IS_ITERATING
 
 #include <ndnboost/utility/detail/in_place_factory_prefix.hpp>
 
@@ -19,61 +19,61 @@
 
 class in_place_factory_base {} ;
 
-#define  BOOST_PP_ITERATION_LIMITS (0, BOOST_MAX_INPLACE_FACTORY_ARITY)
-#define  BOOST_PP_FILENAME_1 <ndnboost/utility/in_place_factory.hpp>
-#include BOOST_PP_ITERATE()
+#define  NDNBOOST_PP_ITERATION_LIMITS (0, NDNBOOST_MAX_INPLACE_FACTORY_ARITY)
+#define  NDNBOOST_PP_FILENAME_1 <ndnboost/utility/in_place_factory.hpp>
+#include NDNBOOST_PP_ITERATE()
 
 } // namespace ndnboost
 
 #include <ndnboost/utility/detail/in_place_factory_suffix.hpp>
 
-#define BOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
+#define NDNBOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
 #else
-#define N BOOST_PP_ITERATION()
+#define N NDNBOOST_PP_ITERATION()
 
 #if N
-template< BOOST_PP_ENUM_PARAMS(N, class A) >
+template< NDNBOOST_PP_ENUM_PARAMS(N, class A) >
 #endif
-class BOOST_PP_CAT(in_place_factory,N)
+class NDNBOOST_PP_CAT(in_place_factory,N)
   : 
   public in_place_factory_base
 {
 public:
 
-  explicit BOOST_PP_CAT(in_place_factory,N)
-      ( BOOST_PP_ENUM_BINARY_PARAMS(N,A,const& a) )
+  explicit NDNBOOST_PP_CAT(in_place_factory,N)
+      ( NDNBOOST_PP_ENUM_BINARY_PARAMS(N,A,const& a) )
 #if N > 0
-    : BOOST_PP_ENUM(N, BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_INIT, _)
+    : NDNBOOST_PP_ENUM(N, NDNBOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_INIT, _)
 #endif
   {}
 
   template<class T>
   void* apply(void* address
-      BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) const
+      NDNBOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) const
   {
-    return new(address) T( BOOST_PP_ENUM_PARAMS(N, m_a) );
+    return new(address) T( NDNBOOST_PP_ENUM_PARAMS(N, m_a) );
   }
 
   template<class T>
   void* apply(void* address, std::size_t n
-      BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) const
+      NDNBOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) const
   {
-    for(char* next = address = this->BOOST_NESTED_TEMPLATE apply<T>(address);
+    for(char* next = address = this->NDNBOOST_NESTED_TEMPLATE apply<T>(address);
         !! --n;)
-      this->BOOST_NESTED_TEMPLATE apply<T>(next = next+sizeof(T));
+      this->NDNBOOST_NESTED_TEMPLATE apply<T>(next = next+sizeof(T));
     return address; 
   }
 
-  BOOST_PP_REPEAT(N, BOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_DECL, _)
+  NDNBOOST_PP_REPEAT(N, NDNBOOST_DEFINE_INPLACE_FACTORY_CLASS_MEMBER_DECL, _)
 };
 
 #if N > 0
-template< BOOST_PP_ENUM_PARAMS(N, class A) >
-inline BOOST_PP_CAT(in_place_factory,N)< BOOST_PP_ENUM_PARAMS(N, A) >
-in_place( BOOST_PP_ENUM_BINARY_PARAMS(N, A, const& a) )
+template< NDNBOOST_PP_ENUM_PARAMS(N, class A) >
+inline NDNBOOST_PP_CAT(in_place_factory,N)< NDNBOOST_PP_ENUM_PARAMS(N, A) >
+in_place( NDNBOOST_PP_ENUM_BINARY_PARAMS(N, A, const& a) )
 {
-  return BOOST_PP_CAT(in_place_factory,N)< BOOST_PP_ENUM_PARAMS(N, A) >
-      ( BOOST_PP_ENUM_PARAMS(N, a) );
+  return NDNBOOST_PP_CAT(in_place_factory,N)< NDNBOOST_PP_ENUM_PARAMS(N, A) >
+      ( NDNBOOST_PP_ENUM_PARAMS(N, a) );
 }
 #else
 inline in_place_factory0 in_place()