ndnboost: Also rename BOOST_ to NDNBOOST_
diff --git a/include/ndnboost/move/algorithm.hpp b/include/ndnboost/move/algorithm.hpp
index 0feaef3..efd1918 100644
--- a/include/ndnboost/move/algorithm.hpp
+++ b/include/ndnboost/move/algorithm.hpp
@@ -11,8 +11,8 @@
//! \file
-#ifndef BOOST_MOVE_ALGORITHM_HPP
-#define BOOST_MOVE_ALGORITHM_HPP
+#ifndef NDNBOOST_MOVE_ALGORITHM_HPP
+#define NDNBOOST_MOVE_ALGORITHM_HPP
#include <ndnboost/move/detail/config_begin.hpp>
@@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
-#if !defined(BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
+#if !defined(NDNBOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
//! <b>Effects</b>: Moves elements in the range [first,last) into the range [result,result + (last -
//! first)) starting from first and proceeding to last. For each non-negative integer n < (last-first),
@@ -85,7 +85,7 @@
using ::std::move_backward;
-#endif //!defined(BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
+#endif //!defined(NDNBOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
//////////////////////////////////////////////////////////////////////////////
//
@@ -113,20 +113,20 @@
typedef typename std::iterator_traits<I>::value_type input_value_type;
F back = r;
- BOOST_TRY{
+ NDNBOOST_TRY{
while (f != l) {
void * const addr = static_cast<void*>(::ndnboost::move_detail::addressof(*r));
::new(addr) input_value_type(::ndnboost::move(*f));
++f; ++r;
}
}
- BOOST_CATCH(...){
+ NDNBOOST_CATCH(...){
for (; back != r; ++back){
back->~input_value_type();
}
- BOOST_RETHROW;
+ NDNBOOST_RETHROW;
}
- BOOST_CATCH_END
+ NDNBOOST_CATCH_END
return r;
}
@@ -272,4 +272,4 @@
#include <ndnboost/move/detail/config_end.hpp>
-#endif //#ifndef BOOST_MOVE_MOVE_HPP
+#endif //#ifndef NDNBOOST_MOVE_MOVE_HPP
diff --git a/include/ndnboost/move/core.hpp b/include/ndnboost/move/core.hpp
index 92e47ec..1037178 100644
--- a/include/ndnboost/move/core.hpp
+++ b/include/ndnboost/move/core.hpp
@@ -13,35 +13,35 @@
//! This header implements macros to define movable classes and
//! move-aware functions
-#ifndef BOOST_MOVE_CORE_HPP
-#define BOOST_MOVE_CORE_HPP
+#ifndef NDNBOOST_MOVE_CORE_HPP
+#define NDNBOOST_MOVE_CORE_HPP
#include <ndnboost/move/detail/config_begin.hpp>
-#ifdef BOOST_NO_CXX11_DELETED_FUNCTIONS
- #define BOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE) \
+#ifdef NDNBOOST_NO_CXX11_DELETED_FUNCTIONS
+ #define NDNBOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE) \
private:\
TYPE(TYPE &);\
TYPE& operator=(TYPE &);\
//
#else
- #define BOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE) \
+ #define NDNBOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE) \
public:\
TYPE(TYPE const &) = delete;\
TYPE& operator=(TYPE const &) = delete;\
private:\
//
-#endif //BOOST_NO_CXX11_DELETED_FUNCTIONS
+#endif //NDNBOOST_NO_CXX11_DELETED_FUNCTIONS
-#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+#if defined(NDNBOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
#include <ndnboost/move/detail/meta_utils.hpp>
//Move emulation rv breaks standard aliasing rules so add workarounds for some compilers
#if defined(__GNUC__) && (__GNUC__ >= 4)
- #define BOOST_MOVE_ATTRIBUTE_MAY_ALIAS __attribute__((__may_alias__))
+ #define NDNBOOST_MOVE_ATTRIBUTE_MAY_ALIAS __attribute__((__may_alias__))
#else
- #define BOOST_MOVE_ATTRIBUTE_MAY_ALIAS
+ #define NDNBOOST_MOVE_ATTRIBUTE_MAY_ALIAS
#endif
namespace ndnboost {
@@ -63,7 +63,7 @@
~rv();
rv(rv const&);
void operator=(rv const&);
- } BOOST_MOVE_ATTRIBUTE_MAY_ALIAS;
+ } NDNBOOST_MOVE_ATTRIBUTE_MAY_ALIAS;
//////////////////////////////////////////////////////////////////////////////
@@ -113,61 +113,61 @@
} //namespace ndnboost {
- #define BOOST_RV_REF(TYPE)\
+ #define NDNBOOST_RV_REF(TYPE)\
::ndnboost::rv< TYPE >& \
//
- #define BOOST_RV_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
+ #define NDNBOOST_RV_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
::ndnboost::rv< TYPE<ARG1, ARG2> >& \
//
- #define BOOST_RV_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
+ #define NDNBOOST_RV_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
::ndnboost::rv< TYPE<ARG1, ARG2, ARG3> >& \
//
- #define BOOST_RV_REF_BEG\
+ #define NDNBOOST_RV_REF_BEG\
::ndnboost::rv< \
//
- #define BOOST_RV_REF_END\
+ #define NDNBOOST_RV_REF_END\
>& \
//
- #define BOOST_FWD_REF(TYPE)\
+ #define NDNBOOST_FWD_REF(TYPE)\
const TYPE & \
//
- #define BOOST_COPY_ASSIGN_REF(TYPE)\
+ #define NDNBOOST_COPY_ASSIGN_REF(TYPE)\
const ::ndnboost::rv< TYPE >& \
//
- #define BOOST_COPY_ASSIGN_REF_BEG \
+ #define NDNBOOST_COPY_ASSIGN_REF_BEG \
const ::ndnboost::rv< \
//
- #define BOOST_COPY_ASSIGN_REF_END \
+ #define NDNBOOST_COPY_ASSIGN_REF_END \
>& \
//
- #define BOOST_COPY_ASSIGN_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
+ #define NDNBOOST_COPY_ASSIGN_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
const ::ndnboost::rv< TYPE<ARG1, ARG2> >& \
//
- #define BOOST_COPY_ASSIGN_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
+ #define NDNBOOST_COPY_ASSIGN_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
const ::ndnboost::rv< TYPE<ARG1, ARG2, ARG3> >& \
//
- #define BOOST_CATCH_CONST_RLVALUE(TYPE)\
+ #define NDNBOOST_CATCH_CONST_RLVALUE(TYPE)\
const ::ndnboost::rv< TYPE >& \
//
//////////////////////////////////////////////////////////////////////////////
//
- // BOOST_MOVABLE_BUT_NOT_COPYABLE
+ // NDNBOOST_MOVABLE_BUT_NOT_COPYABLE
//
//////////////////////////////////////////////////////////////////////////////
- #define BOOST_MOVABLE_BUT_NOT_COPYABLE(TYPE)\
- BOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE)\
+ #define NDNBOOST_MOVABLE_BUT_NOT_COPYABLE(TYPE)\
+ NDNBOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE)\
public:\
operator ::ndnboost::rv<TYPE>&() \
{ return *static_cast< ::ndnboost::rv<TYPE>* >(this); }\
@@ -178,11 +178,11 @@
//////////////////////////////////////////////////////////////////////////////
//
- // BOOST_COPYABLE_AND_MOVABLE
+ // NDNBOOST_COPYABLE_AND_MOVABLE
//
//////////////////////////////////////////////////////////////////////////////
- #define BOOST_COPYABLE_AND_MOVABLE(TYPE)\
+ #define NDNBOOST_COPYABLE_AND_MOVABLE(TYPE)\
public:\
TYPE& operator=(TYPE &t)\
{ this->operator=(static_cast<const ::ndnboost::rv<TYPE> &>(const_cast<const TYPE &>(t))); return *this;}\
@@ -194,7 +194,7 @@
private:\
//
- #define BOOST_COPYABLE_AND_MOVABLE_ALT(TYPE)\
+ #define NDNBOOST_COPYABLE_AND_MOVABLE_ALT(TYPE)\
public:\
operator ::ndnboost::rv<TYPE>&() \
{ return *static_cast< ::ndnboost::rv<TYPE>* >(this); }\
@@ -203,27 +203,27 @@
private:\
//
-#else //BOOST_NO_CXX11_RVALUE_REFERENCES
+#else //NDNBOOST_NO_CXX11_RVALUE_REFERENCES
//Compiler workaround detection
- #if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ #if !defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5) && !defined(__clang__)
//Pre-standard rvalue binding rules
- #define BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES
+ #define NDNBOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES
#elif defined(_MSC_VER) && (_MSC_VER == 1600)
//Standard rvalue binding rules but with some bugs
- #define BOOST_MOVE_MSVC_10_MEMBER_RVALUE_REF_BUG
+ #define NDNBOOST_MOVE_MSVC_10_MEMBER_RVALUE_REF_BUG
//Use standard library for MSVC to avoid namespace issues as
//some move calls in the STL are not fully qualified.
- //#define BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE
+ //#define NDNBOOST_MOVE_USE_STANDARD_LIBRARY_MOVE
#endif
#endif
//! This macro marks a type as movable but not copyable, disabling copy construction
//! and assignment. The user will need to write a move constructor/assignment as explained
//! in the documentation to fully write a movable but not copyable class.
- #define BOOST_MOVABLE_BUT_NOT_COPYABLE(TYPE)\
- BOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE)\
+ #define NDNBOOST_MOVABLE_BUT_NOT_COPYABLE(TYPE)\
+ NDNBOOST_MOVE_IMPL_NO_COPY_CTOR_OR_ASSIGN(TYPE)\
public:\
typedef int boost_move_emulation_t;\
//
@@ -231,18 +231,18 @@
//! This macro marks a type as copyable and movable.
//! The user will need to write a move constructor/assignment and a copy assignment
//! as explained in the documentation to fully write a copyable and movable class.
- #define BOOST_COPYABLE_AND_MOVABLE(TYPE)\
+ #define NDNBOOST_COPYABLE_AND_MOVABLE(TYPE)\
//
- #if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
- #define BOOST_COPYABLE_AND_MOVABLE_ALT(TYPE)\
+ #if !defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
+ #define NDNBOOST_COPYABLE_AND_MOVABLE_ALT(TYPE)\
//
- #endif //#if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ #endif //#if !defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
namespace ndnboost {
//!This trait yields to a compile-time true boolean if T was marked as
- //!BOOST_MOVABLE_BUT_NOT_COPYABLE or BOOST_COPYABLE_AND_MOVABLE and
+ //!NDNBOOST_MOVABLE_BUT_NOT_COPYABLE or NDNBOOST_COPYABLE_AND_MOVABLE and
//!rvalue references are not available on the platform. False otherwise.
template<class T>
struct has_move_emulation_enabled
@@ -254,79 +254,79 @@
//!This macro is used to achieve portable syntax in move
//!constructors and assignments for classes marked as
- //!BOOST_COPYABLE_AND_MOVABLE or BOOST_MOVABLE_BUT_NOT_COPYABLE
- #define BOOST_RV_REF(TYPE)\
+ //!NDNBOOST_COPYABLE_AND_MOVABLE or NDNBOOST_MOVABLE_BUT_NOT_COPYABLE
+ #define NDNBOOST_RV_REF(TYPE)\
TYPE && \
//
//!This macro is used to achieve portable syntax in move
//!constructors and assignments for template classes marked as
- //!BOOST_COPYABLE_AND_MOVABLE or BOOST_MOVABLE_BUT_NOT_COPYABLE.
+ //!NDNBOOST_COPYABLE_AND_MOVABLE or NDNBOOST_MOVABLE_BUT_NOT_COPYABLE.
//!As macros have problems with comma-separatd template arguments,
- //!the template argument must be preceded with BOOST_RV_REF_START
- //!and ended with BOOST_RV_REF_END
- #define BOOST_RV_REF_BEG\
+ //!the template argument must be preceded with NDNBOOST_RV_REF_START
+ //!and ended with NDNBOOST_RV_REF_END
+ #define NDNBOOST_RV_REF_BEG\
\
//
//!This macro is used to achieve portable syntax in move
//!constructors and assignments for template classes marked as
- //!BOOST_COPYABLE_AND_MOVABLE or BOOST_MOVABLE_BUT_NOT_COPYABLE.
+ //!NDNBOOST_COPYABLE_AND_MOVABLE or NDNBOOST_MOVABLE_BUT_NOT_COPYABLE.
//!As macros have problems with comma-separatd template arguments,
- //!the template argument must be preceded with BOOST_RV_REF_START
- //!and ended with BOOST_RV_REF_END
- #define BOOST_RV_REF_END\
+ //!the template argument must be preceded with NDNBOOST_RV_REF_START
+ //!and ended with NDNBOOST_RV_REF_END
+ #define NDNBOOST_RV_REF_END\
&& \
//!This macro is used to achieve portable syntax in copy
- //!assignment for classes marked as BOOST_COPYABLE_AND_MOVABLE.
- #define BOOST_COPY_ASSIGN_REF(TYPE)\
+ //!assignment for classes marked as NDNBOOST_COPYABLE_AND_MOVABLE.
+ #define NDNBOOST_COPY_ASSIGN_REF(TYPE)\
const TYPE & \
//
//! This macro is used to implement portable perfect forwarding
//! as explained in the documentation.
- #define BOOST_FWD_REF(TYPE)\
+ #define NDNBOOST_FWD_REF(TYPE)\
TYPE && \
//
- #if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ #if !defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
/// @cond
- #define BOOST_RV_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
+ #define NDNBOOST_RV_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
TYPE<ARG1, ARG2> && \
//
- #define BOOST_RV_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
+ #define NDNBOOST_RV_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
TYPE<ARG1, ARG2, ARG3> && \
//
- #define BOOST_COPY_ASSIGN_REF_BEG \
+ #define NDNBOOST_COPY_ASSIGN_REF_BEG \
const \
//
- #define BOOST_COPY_ASSIGN_REF_END \
+ #define NDNBOOST_COPY_ASSIGN_REF_END \
& \
//
- #define BOOST_COPY_ASSIGN_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
+ #define NDNBOOST_COPY_ASSIGN_REF_2_TEMPL_ARGS(TYPE, ARG1, ARG2)\
const TYPE<ARG1, ARG2> & \
//
- #define BOOST_COPY_ASSIGN_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
+ #define NDNBOOST_COPY_ASSIGN_REF_3_TEMPL_ARGS(TYPE, ARG1, ARG2, ARG3)\
const TYPE<ARG1, ARG2, ARG3>& \
//
- #define BOOST_CATCH_CONST_RLVALUE(TYPE)\
+ #define NDNBOOST_CATCH_CONST_RLVALUE(TYPE)\
const TYPE & \
//
/// @endcond
- #endif //#if !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ #endif //#if !defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
-#endif //BOOST_NO_CXX11_RVALUE_REFERENCES
+#endif //NDNBOOST_NO_CXX11_RVALUE_REFERENCES
#include <ndnboost/move/detail/config_end.hpp>
-#endif //#ifndef BOOST_MOVE_CORE_HPP
+#endif //#ifndef NDNBOOST_MOVE_CORE_HPP
diff --git a/include/ndnboost/move/detail/config_begin.hpp b/include/ndnboost/move/detail/config_begin.hpp
index 4368aeb..f898dd4 100644
--- a/include/ndnboost/move/detail/config_begin.hpp
+++ b/include/ndnboost/move/detail/config_begin.hpp
@@ -9,13 +9,13 @@
//////////////////////////////////////////////////////////////////////////////
#include <ndnboost/config.hpp>
-#ifdef BOOST_MSVC
+#ifdef NDNBOOST_MSVC
#ifndef _CRT_SECURE_NO_DEPRECATE
- #define BOOST_MOVE_CRT_SECURE_NO_DEPRECATE
+ #define NDNBOOST_MOVE_CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_DEPRECATE
#endif
#ifndef _SCL_SECURE_NO_WARNINGS
- #define BOOST_MOVE_SCL_SECURE_NO_WARNINGS
+ #define NDNBOOST_MOVE_SCL_SECURE_NO_WARNINGS
#define _SCL_SECURE_NO_WARNINGS
#endif
#pragma warning (push)
diff --git a/include/ndnboost/move/detail/config_end.hpp b/include/ndnboost/move/detail/config_end.hpp
index c43bce0..bfba733 100644
--- a/include/ndnboost/move/detail/config_end.hpp
+++ b/include/ndnboost/move/detail/config_end.hpp
@@ -7,14 +7,14 @@
// See http://www.boost.org/libs/container for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-#if defined BOOST_MSVC
+#if defined NDNBOOST_MSVC
#pragma warning (pop)
- #ifdef BOOST_MOVE_DETAIL_CRT_SECURE_NO_DEPRECATE
- #undef BOOST_MOVE_DETAIL_CRT_SECURE_NO_DEPRECATE
+ #ifdef NDNBOOST_MOVE_DETAIL_CRT_SECURE_NO_DEPRECATE
+ #undef NDNBOOST_MOVE_DETAIL_CRT_SECURE_NO_DEPRECATE
#undef _CRT_SECURE_NO_DEPRECATE
#endif
- #ifndef BOOST_MOVE_SCL_SECURE_NO_WARNINGS
- #undef BOOST_MOVE_SCL_SECURE_NO_WARNINGS
+ #ifndef NDNBOOST_MOVE_SCL_SECURE_NO_WARNINGS
+ #undef NDNBOOST_MOVE_SCL_SECURE_NO_WARNINGS
#undef _SCL_SECURE_NO_WARNINGS
#endif
#endif
diff --git a/include/ndnboost/move/detail/meta_utils.hpp b/include/ndnboost/move/detail/meta_utils.hpp
index 1f68fb2..9823c20 100644
--- a/include/ndnboost/move/detail/meta_utils.hpp
+++ b/include/ndnboost/move/detail/meta_utils.hpp
@@ -11,8 +11,8 @@
//! \file
-#ifndef BOOST_MOVE_DETAIL_META_UTILS_HPP
-#define BOOST_MOVE_DETAIL_META_UTILS_HPP
+#ifndef NDNBOOST_MOVE_DETAIL_META_UTILS_HPP
+#define NDNBOOST_MOVE_DETAIL_META_UTILS_HPP
#include <ndnboost/move/detail/config_begin.hpp>
@@ -155,4 +155,4 @@
#include <ndnboost/move/detail/config_end.hpp>
-#endif //#ifndef BOOST_MOVE_DETAIL_META_UTILS_HPP
+#endif //#ifndef NDNBOOST_MOVE_DETAIL_META_UTILS_HPP
diff --git a/include/ndnboost/move/iterator.hpp b/include/ndnboost/move/iterator.hpp
index 12339b0..59d1a84 100644
--- a/include/ndnboost/move/iterator.hpp
+++ b/include/ndnboost/move/iterator.hpp
@@ -11,8 +11,8 @@
//! \file
-#ifndef BOOST_MOVE_ITERATOR_HPP
-#define BOOST_MOVE_ITERATOR_HPP
+#ifndef NDNBOOST_MOVE_ITERATOR_HPP
+#define NDNBOOST_MOVE_ITERATOR_HPP
#include <ndnboost/move/detail/config_begin.hpp>
#include <ndnboost/move/utility.hpp>
@@ -37,7 +37,7 @@
public:
typedef It iterator_type;
typedef typename std::iterator_traits<iterator_type>::value_type value_type;
- #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ #if !defined(NDNBOOST_NO_CXX11_RVALUE_REFERENCES) || defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
typedef value_type && reference;
#else
typedef typename ::ndnboost::move_detail::if_
@@ -66,7 +66,7 @@
reference operator*() const
{
- #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
+ #if defined(NDNBOOST_NO_CXX11_RVALUE_REFERENCES) || defined(NDNBOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
return *m_it;
#else
return ::ndnboost::move(*m_it);
@@ -102,7 +102,7 @@
reference operator[](difference_type n) const
{
- #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
+ #if defined(NDNBOOST_NO_CXX11_RVALUE_REFERENCES) || defined(NDNBOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
return m_it[n];
#else
return ::ndnboost::move(m_it[n]);
@@ -191,7 +191,7 @@
back_move_insert_iterator& operator=(reference x)
{ container_m->push_back(ndnboost::move(x)); return *this; }
- back_move_insert_iterator& operator=(BOOST_RV_REF(value_type) x)
+ back_move_insert_iterator& operator=(NDNBOOST_RV_REF(value_type) x)
{ reference rx = x; return this->operator=(rx); }
back_move_insert_iterator& operator*() { return *this; }
@@ -231,7 +231,7 @@
front_move_insert_iterator& operator=(reference x)
{ container_m->push_front(ndnboost::move(x)); return *this; }
- front_move_insert_iterator& operator=(BOOST_RV_REF(value_type) x)
+ front_move_insert_iterator& operator=(NDNBOOST_RV_REF(value_type) x)
{ reference rx = x; return this->operator=(rx); }
front_move_insert_iterator& operator*() { return *this; }
@@ -275,7 +275,7 @@
return *this;
}
- move_insert_iterator& operator=(BOOST_RV_REF(value_type) x)
+ move_insert_iterator& operator=(NDNBOOST_RV_REF(value_type) x)
{ reference rx = x; return this->operator=(rx); }
move_insert_iterator& operator*() { return *this; }
@@ -295,4 +295,4 @@
#include <ndnboost/move/detail/config_end.hpp>
-#endif //#ifndef BOOST_MOVE_ITERATOR_HPP
+#endif //#ifndef NDNBOOST_MOVE_ITERATOR_HPP
diff --git a/include/ndnboost/move/move.hpp b/include/ndnboost/move/move.hpp
index 822ffb5..c27b6d9 100644
--- a/include/ndnboost/move/move.hpp
+++ b/include/ndnboost/move/move.hpp
@@ -14,8 +14,8 @@
//! A general library header that includes
//! the rest of top-level headers.
-#ifndef BOOST_MOVE_MOVE_HPP
-#define BOOST_MOVE_MOVE_HPP
+#ifndef NDNBOOST_MOVE_MOVE_HPP
+#define NDNBOOST_MOVE_MOVE_HPP
#include <ndnboost/move/detail/config_begin.hpp>
#include <ndnboost/move/utility.hpp>
@@ -24,4 +24,4 @@
#include <ndnboost/move/algorithm.hpp>
#include <ndnboost/move/detail/config_end.hpp>
-#endif //#ifndef BOOST_MOVE_MOVE_HPP
+#endif //#ifndef NDNBOOST_MOVE_MOVE_HPP
diff --git a/include/ndnboost/move/traits.hpp b/include/ndnboost/move/traits.hpp
index 47d585d..6b25fd5 100644
--- a/include/ndnboost/move/traits.hpp
+++ b/include/ndnboost/move/traits.hpp
@@ -11,14 +11,14 @@
//! \file
-#ifndef BOOST_MOVE_MOVE_TRAITS_HPP
-#define BOOST_MOVE_MOVE_TRAITS_HPP
+#ifndef NDNBOOST_MOVE_MOVE_TRAITS_HPP
+#define NDNBOOST_MOVE_MOVE_TRAITS_HPP
#include <ndnboost/move/detail/config_begin.hpp>
#include <ndnboost/type_traits/has_trivial_destructor.hpp>
#include <ndnboost/move/detail/meta_utils.hpp>
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
#include <ndnboost/move/core.hpp>
#endif
@@ -49,9 +49,9 @@
// Code from Jeffrey Lee Hellrung, many thanks
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T> struct forward_type { typedef T type; };
-#else // #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#else // #ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T>
struct forward_type
{ typedef const T &type; };
@@ -59,12 +59,12 @@
template< class T>
struct forward_type< ndnboost::rv<T> >
{ typedef T type; };
-#endif // #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#endif // #ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T > struct is_rvalue_reference : ::ndnboost::move_detail::integral_constant<bool, false> { };
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T > struct is_rvalue_reference< T&& > : ::ndnboost::move_detail::integral_constant<bool, true> { };
-#else // #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#else // #ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T > struct is_rvalue_reference< ndnboost::rv<T>& >
: ::ndnboost::move_detail::integral_constant<bool, true>
{};
@@ -72,11 +72,11 @@
template< class T > struct is_rvalue_reference< const ndnboost::rv<T>& >
: ::ndnboost::move_detail::integral_constant<bool, true>
{};
-#endif // #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#endif // #ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T > struct add_rvalue_reference { typedef T&& type; };
-#else // #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#else // #ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
namespace detail_add_rvalue_reference
{
template< class T
@@ -100,13 +100,13 @@
struct add_rvalue_reference<T &>
{ typedef T & type; };
-#endif // #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#endif // #ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T > struct remove_rvalue_reference { typedef T type; };
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T > struct remove_rvalue_reference< T&& > { typedef T type; };
-#else // #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#else // #ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template< class T > struct remove_rvalue_reference< rv<T> > { typedef T type; };
template< class T > struct remove_rvalue_reference< const rv<T> > { typedef T type; };
template< class T > struct remove_rvalue_reference< volatile rv<T> > { typedef T type; };
@@ -115,7 +115,7 @@
template< class T > struct remove_rvalue_reference< const rv<T>& > { typedef T type; };
template< class T > struct remove_rvalue_reference< volatile rv<T>& > { typedef T type; };
template< class T > struct remove_rvalue_reference< const volatile rv<T>& >{ typedef T type; };
-#endif // #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+#endif // #ifndef NDNBOOST_NO_CXX11_RVALUE_REFERENCES
template <typename T>
typename ndnboost::move_detail::add_rvalue_reference<T>::type declval();
@@ -139,4 +139,4 @@
#include <ndnboost/move/detail/config_end.hpp>
-#endif //#ifndef BOOST_MOVE_MOVE_TRAITS_HPP
+#endif //#ifndef NDNBOOST_MOVE_MOVE_TRAITS_HPP
diff --git a/include/ndnboost/move/utility.hpp b/include/ndnboost/move/utility.hpp
index 2b82879..cbc919d 100644
--- a/include/ndnboost/move/utility.hpp
+++ b/include/ndnboost/move/utility.hpp
@@ -11,14 +11,14 @@
//! \file
-#ifndef BOOST_MOVE_MOVE_UTILITY_HPP
-#define BOOST_MOVE_MOVE_UTILITY_HPP
+#ifndef NDNBOOST_MOVE_MOVE_UTILITY_HPP
+#define NDNBOOST_MOVE_MOVE_UTILITY_HPP
#include <ndnboost/move/detail/config_begin.hpp>
#include <ndnboost/move/core.hpp>
#include <ndnboost/move/detail/meta_utils.hpp>
-#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+#if defined(NDNBOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
namespace ndnboost {
@@ -82,9 +82,9 @@
} //namespace ndnboost
-#else //#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+#else //#if defined(NDNBOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
- #if defined(BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
+ #if defined(NDNBOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
#include <utility>
namespace ndnboost{
@@ -94,7 +94,7 @@
} //namespace ndnboost
- #else //!BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE
+ #else //!NDNBOOST_MOVE_USE_STANDARD_LIBRARY_MOVE
#include <ndnboost/type_traits/remove_reference.hpp>
@@ -118,27 +118,27 @@
//
//////////////////////////////////////////////////////////////////////////////
- #if defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ #if defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
//! This function provides a way to convert a reference into a rvalue reference
//! in compilers with rvalue references. For other compilers converts T & into
//! <i>::ndnboost::rv<T> &</i> so that move emulation is activated.
template <class T>
rvalue_reference move (input_reference);
- #elif defined(BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
+ #elif defined(NDNBOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
//Old move approach, lvalues could bind to rvalue references
template <class T>
inline typename remove_reference<T>::type && move(T&& t)
{ return t; }
- #else //BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES
+ #else //NDNBOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES
template <class T>
inline typename remove_reference<T>::type && move(T&& t)
{ return static_cast<typename remove_reference<T>::type &&>(t); }
- #endif //BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES
+ #endif //NDNBOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES
//////////////////////////////////////////////////////////////////////////////
//
@@ -147,7 +147,7 @@
//////////////////////////////////////////////////////////////////////////////
- #if defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ #if defined(NDNBOOST_MOVE_DOXYGEN_INVOKED)
//! This function provides limited form of forwarding that is usually enough for
//! in-place construction and avoids the exponential overloading for
//! achieve the limited forwarding in C++03.
@@ -160,7 +160,7 @@
//!
//! * Else, output_reference is equal to input_reference.
template <class T> output_reference forward(input_reference);
- #elif defined(BOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
+ #elif defined(NDNBOOST_MOVE_OLD_RVALUE_REF_BINDING_RULES)
//Old move approach, lvalues could bind to rvalue references
@@ -181,14 +181,14 @@
<typename remove_reference<U>::type*, typename remove_reference<T>::type*>::value>::type * = 0*/)
{ return static_cast<T&&>(t); }
- #endif //BOOST_MOVE_DOXYGEN_INVOKED
+ #endif //NDNBOOST_MOVE_DOXYGEN_INVOKED
} //namespace ndnboost {
- #endif //#if defined(BOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
+ #endif //#if defined(NDNBOOST_MOVE_USE_STANDARD_LIBRARY_MOVE)
-#endif //BOOST_NO_CXX11_RVALUE_REFERENCES
+#endif //NDNBOOST_NO_CXX11_RVALUE_REFERENCES
#include <ndnboost/move/detail/config_end.hpp>
-#endif //#ifndef BOOST_MOVE_MOVE_UTILITY_HPP
+#endif //#ifndef NDNBOOST_MOVE_MOVE_UTILITY_HPP