ndnboost: Also rename BOOST_ to NDNBOOST_
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/and.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/and.hpp
index 2ae4e3b..d69b940 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/and.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/and.hpp
@@ -30,7 +30,7 @@
>
struct result_
: and_impl<
- BOOST_MPL_AUX_NESTED_TYPE_WKND(T1)::value
+ NDNBOOST_MPL_AUX_NESTED_TYPE_WKND(T1)::value
>::template result_< T2,T3,T4,true_ >
{
};
@@ -46,25 +46,25 @@
} // namespace aux
template<
- typename BOOST_MPL_AUX_NA_PARAM(T1)
- , typename BOOST_MPL_AUX_NA_PARAM(T2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(T1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(T2)
, typename T3 = true_, typename T4 = true_, typename T5 = true_
>
struct and_
: aux::and_impl<
- BOOST_MPL_AUX_NESTED_TYPE_WKND(T1)::value
+ NDNBOOST_MPL_AUX_NESTED_TYPE_WKND(T1)::value
>::template result_< T2,T3,T4,T5 >
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, and_
, ( T1, T2, T3, T4, T5)
)
};
-BOOST_MPL_AUX_NA_SPEC2(
+NDNBOOST_MPL_AUX_NA_SPEC2(
2
, 5
, and_
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/apply.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/apply.hpp
index 75fb383..ed5c472 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/apply.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/apply.hpp
@@ -22,7 +22,7 @@
>::type type;
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
1
, apply0
, (F )
@@ -47,7 +47,7 @@
, T1
>::type type;
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
2
, apply1
, (F, T1)
@@ -72,7 +72,7 @@
, T1, T2
>::type type;
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
3
, apply2
, (F, T1, T2)
@@ -97,7 +97,7 @@
, T1, T2, T3
>::type type;
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
4
, apply3
, (F, T1, T2, T3)
@@ -122,7 +122,7 @@
, T1, T2, T3, T4
>::type type;
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, apply4
, (F, T1, T2, T3, T4)
@@ -148,7 +148,7 @@
, T1, T2, T3, T4, T5
>::type type;
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
6
, apply5
, (F, T1, T2, T3, T4, T5)
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/arg.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/arg.hpp
index 9a157c2..154476a 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/arg.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/arg.hpp
@@ -10,12 +10,12 @@
// Preprocessed version of "ndnboost/mpl/arg.hpp" header
// -- DO NOT modify by hand!
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
template<> struct arg< -1 >
{
- BOOST_STATIC_CONSTANT(int, value = -1);
- BOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
- BOOST_MPL_AUX_ARG_TYPEDEF(na, type)
+ NDNBOOST_STATIC_CONSTANT(int, value = -1);
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, type)
template<
typename U1 = na, typename U2 = na, typename U3 = na
@@ -24,16 +24,16 @@
struct apply
{
typedef U1 type;
- BOOST_MPL_AUX_ASSERT_NOT_NA(type);
+ NDNBOOST_MPL_AUX_ASSERT_NOT_NA(type);
};
};
template<> struct arg<1>
{
- BOOST_STATIC_CONSTANT(int, value = 1);
+ NDNBOOST_STATIC_CONSTANT(int, value = 1);
typedef arg<2> next;
- BOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
- BOOST_MPL_AUX_ARG_TYPEDEF(na, type)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, type)
template<
typename U1 = na, typename U2 = na, typename U3 = na
@@ -42,16 +42,16 @@
struct apply
{
typedef U1 type;
- BOOST_MPL_AUX_ASSERT_NOT_NA(type);
+ NDNBOOST_MPL_AUX_ASSERT_NOT_NA(type);
};
};
template<> struct arg<2>
{
- BOOST_STATIC_CONSTANT(int, value = 2);
+ NDNBOOST_STATIC_CONSTANT(int, value = 2);
typedef arg<3> next;
- BOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
- BOOST_MPL_AUX_ARG_TYPEDEF(na, type)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, type)
template<
typename U1 = na, typename U2 = na, typename U3 = na
@@ -60,16 +60,16 @@
struct apply
{
typedef U2 type;
- BOOST_MPL_AUX_ASSERT_NOT_NA(type);
+ NDNBOOST_MPL_AUX_ASSERT_NOT_NA(type);
};
};
template<> struct arg<3>
{
- BOOST_STATIC_CONSTANT(int, value = 3);
+ NDNBOOST_STATIC_CONSTANT(int, value = 3);
typedef arg<4> next;
- BOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
- BOOST_MPL_AUX_ARG_TYPEDEF(na, type)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, type)
template<
typename U1 = na, typename U2 = na, typename U3 = na
@@ -78,16 +78,16 @@
struct apply
{
typedef U3 type;
- BOOST_MPL_AUX_ASSERT_NOT_NA(type);
+ NDNBOOST_MPL_AUX_ASSERT_NOT_NA(type);
};
};
template<> struct arg<4>
{
- BOOST_STATIC_CONSTANT(int, value = 4);
+ NDNBOOST_STATIC_CONSTANT(int, value = 4);
typedef arg<5> next;
- BOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
- BOOST_MPL_AUX_ARG_TYPEDEF(na, type)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, type)
template<
typename U1 = na, typename U2 = na, typename U3 = na
@@ -96,16 +96,16 @@
struct apply
{
typedef U4 type;
- BOOST_MPL_AUX_ASSERT_NOT_NA(type);
+ NDNBOOST_MPL_AUX_ASSERT_NOT_NA(type);
};
};
template<> struct arg<5>
{
- BOOST_STATIC_CONSTANT(int, value = 5);
+ NDNBOOST_STATIC_CONSTANT(int, value = 5);
typedef arg<6> next;
- BOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
- BOOST_MPL_AUX_ARG_TYPEDEF(na, type)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, tag)
+ NDNBOOST_MPL_AUX_ARG_TYPEDEF(na, type)
template<
typename U1 = na, typename U2 = na, typename U3 = na
@@ -114,10 +114,10 @@
struct apply
{
typedef U5 type;
- BOOST_MPL_AUX_ASSERT_NOT_NA(type);
+ NDNBOOST_MPL_AUX_ASSERT_NOT_NA(type);
};
};
-BOOST_MPL_AUX_NONTYPE_ARITY_SPEC(1,int, arg)
+NDNBOOST_MPL_AUX_NONTYPE_ARITY_SPEC(1,int, arg)
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp
index 9b68023..8494a26 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/basic_bind.hpp
@@ -67,7 +67,7 @@
{
template< typename T > struct result_
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
};
@@ -76,7 +76,7 @@
{
template< typename T > struct result_
{
- BOOST_STATIC_CONSTANT(bool, value =
+ NDNBOOST_STATIC_CONSTANT(bool, value =
sizeof(aux::is_bind_helper(static_cast<T*>(0)))
== sizeof(aux::yes_tag)
);
@@ -123,8 +123,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(1, bind0)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(1, bind0)
+NDNBOOST_MPL_AUX_ARITY_SPEC(1, bind0)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(1, bind0)
template<
typename F, typename T1
@@ -160,8 +160,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(2, bind1)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(2, bind1)
+NDNBOOST_MPL_AUX_ARITY_SPEC(2, bind1)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(2, bind1)
template<
typename F, typename T1, typename T2
@@ -198,8 +198,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(3, bind2)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(3, bind2)
+NDNBOOST_MPL_AUX_ARITY_SPEC(3, bind2)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(3, bind2)
template<
typename F, typename T1, typename T2, typename T3
@@ -237,8 +237,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(4, bind3)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(4, bind3)
+NDNBOOST_MPL_AUX_ARITY_SPEC(4, bind3)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(4, bind3)
template<
typename F, typename T1, typename T2, typename T3, typename T4
@@ -278,8 +278,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(5, bind4)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(5, bind4)
+NDNBOOST_MPL_AUX_ARITY_SPEC(5, bind4)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(5, bind4)
template<
typename F, typename T1, typename T2, typename T3, typename T4
@@ -322,7 +322,7 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(6, bind5)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(6, bind5)
+NDNBOOST_MPL_AUX_ARITY_SPEC(6, bind5)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(6, bind5)
}}
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/bind.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/bind.hpp
index 1c3b8d8..92a2b27 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/bind.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/bind.hpp
@@ -93,7 +93,7 @@
{
template< typename T > struct result_
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
};
@@ -102,7 +102,7 @@
{
template< typename T > struct result_
{
- BOOST_STATIC_CONSTANT(bool, value =
+ NDNBOOST_STATIC_CONSTANT(bool, value =
sizeof(aux::is_bind_helper(static_cast<T*>(0)))
== sizeof(aux::yes_tag)
);
@@ -152,8 +152,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(1, bind0)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(1, bind0)
+NDNBOOST_MPL_AUX_ARITY_SPEC(1, bind0)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(1, bind0)
template<
typename F, typename T1
@@ -196,8 +196,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(2, bind1)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(2, bind1)
+NDNBOOST_MPL_AUX_ARITY_SPEC(2, bind1)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(2, bind1)
template<
typename F, typename T1, typename T2
@@ -245,8 +245,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(3, bind2)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(3, bind2)
+NDNBOOST_MPL_AUX_ARITY_SPEC(3, bind2)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(3, bind2)
template<
typename F, typename T1, typename T2, typename T3
@@ -299,8 +299,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(4, bind3)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(4, bind3)
+NDNBOOST_MPL_AUX_ARITY_SPEC(4, bind3)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(4, bind3)
template<
typename F, typename T1, typename T2, typename T3, typename T4
@@ -359,8 +359,8 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(5, bind4)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(5, bind4)
+NDNBOOST_MPL_AUX_ARITY_SPEC(5, bind4)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(5, bind4)
template<
typename F, typename T1, typename T2, typename T3, typename T4
@@ -426,7 +426,7 @@
} // namespace aux
-BOOST_MPL_AUX_ARITY_SPEC(6, bind5)
-BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(6, bind5)
+NDNBOOST_MPL_AUX_ARITY_SPEC(6, bind5)
+NDNBOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(6, bind5)
}}
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitand.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitand.hpp
index b4517bc..f3eb147 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitand.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitand.hpp
@@ -16,8 +16,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct bitand_impl
: if_c<
@@ -34,7 +34,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -43,7 +43,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -52,7 +52,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -64,14 +64,14 @@
/// forward declaration
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct bitand_2;
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
, typename N3 = na, typename N4 = na, typename N5 = na
>
struct bitand_
@@ -87,7 +87,7 @@
>::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, bitand_
, ( N1, N2, N3, N4, N5 )
@@ -109,11 +109,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitand_2, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitand_2, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 5, bitand_)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 5, bitand_)
}}
@@ -123,7 +123,7 @@
template< typename T, T n1, T n2 >
struct bitand_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n1 & n2));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n1 & n2));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitor.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitor.hpp
index a496f89..63f5a00 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitor.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitor.hpp
@@ -16,8 +16,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct bitor_impl
: if_c<
@@ -34,7 +34,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -43,7 +43,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -52,7 +52,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -64,14 +64,14 @@
/// forward declaration
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct bitor_2;
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
, typename N3 = na, typename N4 = na, typename N5 = na
>
struct bitor_
@@ -87,7 +87,7 @@
>::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, bitor_
, ( N1, N2, N3, N4, N5 )
@@ -109,11 +109,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitor_2, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitor_2, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 5, bitor_)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 5, bitor_)
}}
@@ -123,7 +123,7 @@
template< typename T, T n1, T n2 >
struct bitor_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n1 | n2));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n1 | n2));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitxor.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
index b4bf4a0..08cf7c5 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/bitxor.hpp
@@ -16,8 +16,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct bitxor_impl
: if_c<
@@ -34,7 +34,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -43,7 +43,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -52,7 +52,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -64,14 +64,14 @@
/// forward declaration
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct bitxor_2;
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
, typename N3 = na, typename N4 = na, typename N5 = na
>
struct bitxor_
@@ -87,7 +87,7 @@
>::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, bitxor_
, ( N1, N2, N3, N4, N5 )
@@ -109,11 +109,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitxor_2, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, bitxor_2, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 5, bitxor_)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 5, bitxor_)
}}
@@ -123,7 +123,7 @@
template< typename T, T n1, T n2 >
struct bitxor_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n1 ^ n2));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n1 ^ n2));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/deque.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/deque.hpp
index 8a7e2c3..ed97d82 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/deque.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/deque.hpp
@@ -484,13 +484,13 @@
template< typename T >
struct is_deque_arg
{
- BOOST_STATIC_CONSTANT(bool, value = true);
+ NDNBOOST_STATIC_CONSTANT(bool, value = true);
};
template<>
struct is_deque_arg<na>
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
template<
@@ -501,7 +501,7 @@
>
struct deque_count_args
{
- BOOST_STATIC_CONSTANT(int, value =
+ NDNBOOST_STATIC_CONSTANT(int, value =
is_deque_arg<T1>::value + is_deque_arg<T2>::value
+ is_deque_arg<T3>::value + is_deque_arg<T4>::value
+ is_deque_arg<T5>::value + is_deque_arg<T6>::value
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/divides.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/divides.hpp
index b5f7fdd..b6631ad 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/divides.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/divides.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct divides_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -63,14 +63,14 @@
/// forward declaration
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct divides2;
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
, typename N3 = na, typename N4 = na, typename N5 = na
>
struct divides
@@ -86,7 +86,7 @@
>::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, divides
, ( N1, N2, N3, N4, N5 )
@@ -108,11 +108,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, divides2, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, divides2, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 5, divides)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 5, divides)
}}
@@ -122,7 +122,7 @@
template< typename T, T n1, T n2 >
struct divides_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n1 / n2));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n1 / n2));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/equal_to.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/equal_to.hpp
index 6a72eec..2fa2cae 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/equal_to.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/equal_to.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct equal_to_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -61,8 +61,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct equal_to
: aux::msvc_eti_base< typename apply_wrap2<
@@ -75,11 +75,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, equal_to, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, equal_to, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, equal_to)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, equal_to)
}}
@@ -91,9 +91,9 @@
template< typename N1, typename N2 > struct apply
{
- BOOST_STATIC_CONSTANT(bool, value =
- ( BOOST_MPL_AUX_VALUE_WKND(N1)::value ==
- BOOST_MPL_AUX_VALUE_WKND(N2)::value )
+ NDNBOOST_STATIC_CONSTANT(bool, value =
+ ( NDNBOOST_MPL_AUX_VALUE_WKND(N1)::value ==
+ NDNBOOST_MPL_AUX_VALUE_WKND(N2)::value )
);
typedef bool_<value> type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp
index de658d8..7da971e 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/full_lambda.hpp
@@ -548,7 +548,7 @@
typedef typename le_result_::type type;
};
-BOOST_MPL_AUX_NA_SPEC(2, lambda)
+NDNBOOST_MPL_AUX_NA_SPEC(2, lambda)
}}
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/greater.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/greater.hpp
index 38ddec9..90834cf 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/greater.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/greater.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct greater_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -61,8 +61,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct greater
: aux::msvc_eti_base< typename apply_wrap2<
@@ -75,11 +75,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, greater, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, greater, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, greater)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, greater)
}}
@@ -91,9 +91,9 @@
template< typename N1, typename N2 > struct apply
{
- BOOST_STATIC_CONSTANT(bool, value =
- ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >
- BOOST_MPL_AUX_VALUE_WKND(N2)::value )
+ NDNBOOST_STATIC_CONSTANT(bool, value =
+ ( NDNBOOST_MPL_AUX_VALUE_WKND(N1)::value >
+ NDNBOOST_MPL_AUX_VALUE_WKND(N2)::value )
);
typedef bool_<value> type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp
index 578e3cb..b7ca0c0 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/greater_equal.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct greater_equal_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -61,8 +61,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct greater_equal
: aux::msvc_eti_base< typename apply_wrap2<
@@ -75,11 +75,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, greater_equal, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, greater_equal, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, greater_equal)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, greater_equal)
}}
@@ -91,9 +91,9 @@
template< typename N1, typename N2 > struct apply
{
- BOOST_STATIC_CONSTANT(bool, value =
- ( BOOST_MPL_AUX_VALUE_WKND(N1)::value >=
- BOOST_MPL_AUX_VALUE_WKND(N2)::value )
+ NDNBOOST_STATIC_CONSTANT(bool, value =
+ ( NDNBOOST_MPL_AUX_VALUE_WKND(N1)::value >=
+ NDNBOOST_MPL_AUX_VALUE_WKND(N2)::value )
);
typedef bool_<value> type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/inherit.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/inherit.hpp
index 12328f7..7cb0a48 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/inherit.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/inherit.hpp
@@ -55,8 +55,8 @@
} // namespace aux
template<
- typename BOOST_MPL_AUX_NA_PARAM(T1)
- , typename BOOST_MPL_AUX_NA_PARAM(T2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(T1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(T2)
>
struct inherit2
: aux::inherit2_impl<
@@ -65,10 +65,10 @@
>::template result_< inherit2< T1,T2 >,T1, T2 >
{
typedef typename inherit2::type_ type;
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, inherit2, (T1, T2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, inherit2, (T1, T2))
};
-BOOST_MPL_AUX_NA_SPEC(2, inherit2)
+NDNBOOST_MPL_AUX_NA_SPEC(2, inherit2)
template<
typename T1 = na, typename T2 = na, typename T3 = na
@@ -81,14 +81,14 @@
, T3
>
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
3
, inherit3
, ( T1, T2, T3)
)
};
-BOOST_MPL_AUX_NA_SPEC(3, inherit3)
+NDNBOOST_MPL_AUX_NA_SPEC(3, inherit3)
template<
typename T1 = na, typename T2 = na, typename T3 = na, typename T4 = na
@@ -101,14 +101,14 @@
, T4
>
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
4
, inherit4
, ( T1, T2, T3, T4)
)
};
-BOOST_MPL_AUX_NA_SPEC(4, inherit4)
+NDNBOOST_MPL_AUX_NA_SPEC(4, inherit4)
template<
typename T1 = na, typename T2 = na, typename T3 = na, typename T4 = na
@@ -122,14 +122,14 @@
, T5
>
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, inherit5
, ( T1, T2, T3, T4, T5)
)
};
-BOOST_MPL_AUX_NA_SPEC(5, inherit5)
+NDNBOOST_MPL_AUX_NA_SPEC(5, inherit5)
/// primary template
@@ -159,8 +159,8 @@
};
};
-BOOST_MPL_AUX_NA_SPEC_LAMBDA(5, inherit)
-BOOST_MPL_AUX_NA_SPEC_ARITY(5, inherit)
-BOOST_MPL_AUX_NA_SPEC_TEMPLATE_ARITY(5, 5, inherit)
+NDNBOOST_MPL_AUX_NA_SPEC_LAMBDA(5, inherit)
+NDNBOOST_MPL_AUX_NA_SPEC_ARITY(5, inherit)
+NDNBOOST_MPL_AUX_NA_SPEC_TEMPLATE_ARITY(5, 5, inherit)
}}
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp
index b0a2864..a74bd83 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/iter_fold_if_impl.hpp
@@ -61,7 +61,7 @@
{
typedef typename apply2< Predicate,State,Iterator >::type not_last;
typedef typename iter_fold_if_step_impl<
- BOOST_MPL_AUX_MSVC_VALUE_WKND(not_last)::value
+ NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(not_last)::value
>::template result_< Iterator,State,ForwardOp, mpl::next<Iterator> > impl_;
typedef typename impl_::state state;
@@ -78,7 +78,7 @@
{
typedef typename apply2< Predicate,State,Iterator >::type not_last;
typedef typename iter_fold_if_step_impl<
- BOOST_MPL_AUX_MSVC_VALUE_WKND(not_last)::value
+ NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(not_last)::value
>::template result_< Iterator,State,BackwardOp, identity<Iterator> > impl_;
typedef typename impl_::state state;
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp
index 5bfc661..45f5f6b 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/lambda_no_ctps.hpp
@@ -44,7 +44,7 @@
typedef lambda< typename F::arg1, Tag, false_ > l1;
typedef typename l1::is_le is_le1;
typedef aux::lambda_or<
- BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value
+ NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value
> is_le;
typedef bind1<
@@ -74,7 +74,7 @@
typedef aux::lambda_or<
- BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le2)::value
+ NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le2)::value
> is_le;
typedef bind2<
@@ -106,7 +106,7 @@
typedef aux::lambda_or<
- BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le2)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le3)::value
+ NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le2)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le3)::value
> is_le;
typedef bind3<
@@ -140,7 +140,7 @@
typedef aux::lambda_or<
- BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le2)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le3)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le4)::value
+ NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le2)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le3)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le4)::value
> is_le;
typedef bind4<
@@ -177,7 +177,7 @@
typedef aux::lambda_or<
- BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le2)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le3)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le4)::value, BOOST_MPL_AUX_MSVC_VALUE_WKND(is_le5)::value
+ NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le1)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le2)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le3)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le4)::value, NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(is_le5)::value
> is_le;
typedef bind5<
@@ -212,10 +212,10 @@
typedef typename l_::type type;
typedef typename l_::is_le is_le;
- BOOST_MPL_AUX_LAMBDA_SUPPORT(3, lambda, (T, Tag, Protect))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(3, lambda, (T, Tag, Protect))
};
-BOOST_MPL_AUX_NA_SPEC2(1, 3, lambda)
+NDNBOOST_MPL_AUX_NA_SPEC2(1, 3, lambda)
template<
typename T
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/less.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/less.hpp
index d9f73a4..05b6d10 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/less.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/less.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct less_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -61,8 +61,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct less
: aux::msvc_eti_base< typename apply_wrap2<
@@ -75,11 +75,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, less, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, less, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, less)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, less)
}}
@@ -91,9 +91,9 @@
template< typename N1, typename N2 > struct apply
{
- BOOST_STATIC_CONSTANT(bool, value =
- ( BOOST_MPL_AUX_VALUE_WKND(N2)::value >
- BOOST_MPL_AUX_VALUE_WKND(N1)::value )
+ NDNBOOST_STATIC_CONSTANT(bool, value =
+ ( NDNBOOST_MPL_AUX_VALUE_WKND(N2)::value >
+ NDNBOOST_MPL_AUX_VALUE_WKND(N1)::value )
);
typedef bool_<value> type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/less_equal.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/less_equal.hpp
index f203fbe..5ac2a3a 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/less_equal.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/less_equal.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct less_equal_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -61,8 +61,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct less_equal
: aux::msvc_eti_base< typename apply_wrap2<
@@ -75,11 +75,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, less_equal, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, less_equal, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, less_equal)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, less_equal)
}}
@@ -91,9 +91,9 @@
template< typename N1, typename N2 > struct apply
{
- BOOST_STATIC_CONSTANT(bool, value =
- ( BOOST_MPL_AUX_VALUE_WKND(N1)::value <=
- BOOST_MPL_AUX_VALUE_WKND(N2)::value )
+ NDNBOOST_STATIC_CONSTANT(bool, value =
+ ( NDNBOOST_MPL_AUX_VALUE_WKND(N1)::value <=
+ NDNBOOST_MPL_AUX_VALUE_WKND(N2)::value )
);
typedef bool_<value> type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/list.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/list.hpp
index 63062d2..2b19e60 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/list.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/list.hpp
@@ -484,13 +484,13 @@
template< typename T >
struct is_list_arg
{
- BOOST_STATIC_CONSTANT(bool, value = true);
+ NDNBOOST_STATIC_CONSTANT(bool, value = true);
};
template<>
struct is_list_arg<na>
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
template<
@@ -501,7 +501,7 @@
>
struct list_count_args
{
- BOOST_STATIC_CONSTANT(int, value =
+ NDNBOOST_STATIC_CONSTANT(int, value =
is_list_arg<T1>::value + is_list_arg<T2>::value
+ is_list_arg<T3>::value + is_list_arg<T4>::value
+ is_list_arg<T5>::value + is_list_arg<T6>::value
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/list_c.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/list_c.hpp
index 010f92e..0ed7f7e 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/list_c.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/list_c.hpp
@@ -463,13 +463,13 @@
template< long C >
struct is_list_c_arg
{
- BOOST_STATIC_CONSTANT(bool, value = true);
+ NDNBOOST_STATIC_CONSTANT(bool, value = true);
};
template<>
struct is_list_c_arg<LONG_MAX>
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
template<
@@ -479,7 +479,7 @@
>
struct list_c_count_args
{
- BOOST_STATIC_CONSTANT(int, value =
+ NDNBOOST_STATIC_CONSTANT(int, value =
is_list_c_arg<C1>::value + is_list_c_arg<C2>::value
+ is_list_c_arg<C3>::value + is_list_c_arg<C4>::value
+ is_list_c_arg<C5>::value + is_list_c_arg<C6>::value
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/map.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/map.hpp
index 3066603..75174c8 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/map.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/map.hpp
@@ -484,13 +484,13 @@
template< typename T >
struct is_map_arg
{
- BOOST_STATIC_CONSTANT(bool, value = true);
+ NDNBOOST_STATIC_CONSTANT(bool, value = true);
};
template<>
struct is_map_arg<na>
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
template<
@@ -501,7 +501,7 @@
>
struct map_count_args
{
- BOOST_STATIC_CONSTANT(int, value =
+ NDNBOOST_STATIC_CONSTANT(int, value =
is_map_arg<T1>::value + is_map_arg<T2>::value
+ is_map_arg<T3>::value + is_map_arg<T4>::value
+ is_map_arg<T5>::value + is_map_arg<T6>::value
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/minus.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/minus.hpp
index dc70c44..9e3a907 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/minus.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/minus.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct minus_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -63,14 +63,14 @@
/// forward declaration
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct minus2;
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
, typename N3 = na, typename N4 = na, typename N5 = na
>
struct minus
@@ -86,7 +86,7 @@
>::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, minus
, ( N1, N2, N3, N4, N5 )
@@ -108,11 +108,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, minus2, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, minus2, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 5, minus)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 5, minus)
}}
@@ -122,7 +122,7 @@
template< typename T, T n1, T n2 >
struct minus_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n1 - n2));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n1 - n2));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/modulus.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/modulus.hpp
index be8eef6..0185ebf 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/modulus.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/modulus.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct modulus_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -61,8 +61,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct modulus
: aux::msvc_eti_base< typename apply_wrap2<
@@ -75,11 +75,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, modulus, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, modulus, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, modulus)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, modulus)
}}
@@ -89,7 +89,7 @@
template< typename T, T n1, T n2 >
struct modulus_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n1 % n2));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n1 % n2));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp
index 6a8bb75..77b0a13 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/not_equal_to.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct not_equal_to_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -61,8 +61,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct not_equal_to
: aux::msvc_eti_base< typename apply_wrap2<
@@ -75,11 +75,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, not_equal_to, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, not_equal_to, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, not_equal_to)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, not_equal_to)
}}
@@ -91,9 +91,9 @@
template< typename N1, typename N2 > struct apply
{
- BOOST_STATIC_CONSTANT(bool, value =
- ( BOOST_MPL_AUX_VALUE_WKND(N1)::value !=
- BOOST_MPL_AUX_VALUE_WKND(N2)::value )
+ NDNBOOST_STATIC_CONSTANT(bool, value =
+ ( NDNBOOST_MPL_AUX_VALUE_WKND(N1)::value !=
+ NDNBOOST_MPL_AUX_VALUE_WKND(N2)::value )
);
typedef bool_<value> type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/or.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/or.hpp
index b0b3a7f..7123b8d 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/or.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/or.hpp
@@ -30,7 +30,7 @@
>
struct result_
: or_impl<
- BOOST_MPL_AUX_NESTED_TYPE_WKND(T1)::value
+ NDNBOOST_MPL_AUX_NESTED_TYPE_WKND(T1)::value
>::template result_< T2,T3,T4,false_ >
{
};
@@ -46,25 +46,25 @@
} // namespace aux
template<
- typename BOOST_MPL_AUX_NA_PARAM(T1)
- , typename BOOST_MPL_AUX_NA_PARAM(T2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(T1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(T2)
, typename T3 = false_, typename T4 = false_, typename T5 = false_
>
struct or_
: aux::or_impl<
- BOOST_MPL_AUX_NESTED_TYPE_WKND(T1)::value
+ NDNBOOST_MPL_AUX_NESTED_TYPE_WKND(T1)::value
>::template result_< T2,T3,T4,T5 >
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, or_
, ( T1, T2, T3, T4, T5)
)
};
-BOOST_MPL_AUX_NA_SPEC2(
+NDNBOOST_MPL_AUX_NA_SPEC2(
2
, 5
, or_
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/placeholders.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/placeholders.hpp
index ecd4514..3a28c09 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/placeholders.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/placeholders.hpp
@@ -10,96 +10,96 @@
// Preprocessed version of "ndnboost/mpl/placeholders.hpp" header
// -- DO NOT modify by hand!
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
typedef arg< -1 > _;
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
namespace ndnboost { namespace mpl {
-BOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_)
+NDNBOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_)
namespace placeholders {
-using BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_;
+using NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_;
}
}}
/// agurt, 17/mar/02: one more placeholder for the last 'apply#'
/// specialization
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
typedef arg<1> _1;
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
namespace ndnboost { namespace mpl {
-BOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_1)
+NDNBOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_1)
namespace placeholders {
-using BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_1;
+using NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_1;
}
}}
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
typedef arg<2> _2;
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
namespace ndnboost { namespace mpl {
-BOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_2)
+NDNBOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_2)
namespace placeholders {
-using BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_2;
+using NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_2;
}
}}
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
typedef arg<3> _3;
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
namespace ndnboost { namespace mpl {
-BOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_3)
+NDNBOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_3)
namespace placeholders {
-using BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_3;
+using NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_3;
}
}}
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
typedef arg<4> _4;
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
namespace ndnboost { namespace mpl {
-BOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_4)
+NDNBOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_4)
namespace placeholders {
-using BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_4;
+using NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_4;
}
}}
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
typedef arg<5> _5;
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
namespace ndnboost { namespace mpl {
-BOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_5)
+NDNBOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_5)
namespace placeholders {
-using BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_5;
+using NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_5;
}
}}
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
typedef arg<6> _6;
-BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
+NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
namespace ndnboost { namespace mpl {
-BOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_6)
+NDNBOOST_MPL_AUX_ARG_ADL_BARRIER_DECL(_6)
namespace placeholders {
-using BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_6;
+using NDNBOOST_MPL_AUX_ADL_BARRIER_NAMESPACE::_6;
}
}}
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/plus.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/plus.hpp
index fc8884e..697794a 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/plus.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/plus.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct plus_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -63,14 +63,14 @@
/// forward declaration
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct plus2;
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
, typename N3 = na, typename N4 = na, typename N5 = na
>
struct plus
@@ -86,7 +86,7 @@
>::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, plus
, ( N1, N2, N3, N4, N5 )
@@ -108,11 +108,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, plus2, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, plus2, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 5, plus)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 5, plus)
}}
@@ -122,7 +122,7 @@
template< typename T, T n1, T n2 >
struct plus_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n1 + n2));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n1 + n2));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/set.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/set.hpp
index e964879..484d53e 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/set.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/set.hpp
@@ -484,13 +484,13 @@
template< typename T >
struct is_set_arg
{
- BOOST_STATIC_CONSTANT(bool, value = true);
+ NDNBOOST_STATIC_CONSTANT(bool, value = true);
};
template<>
struct is_set_arg<na>
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
template<
@@ -501,7 +501,7 @@
>
struct set_count_args
{
- BOOST_STATIC_CONSTANT(int, value =
+ NDNBOOST_STATIC_CONSTANT(int, value =
is_set_arg<T1>::value + is_set_arg<T2>::value
+ is_set_arg<T3>::value + is_set_arg<T4>::value
+ is_set_arg<T5>::value + is_set_arg<T6>::value
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/set_c.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/set_c.hpp
index a9a9b18..3b5f2ab 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/set_c.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/set_c.hpp
@@ -463,13 +463,13 @@
template< long C >
struct is_set_c_arg
{
- BOOST_STATIC_CONSTANT(bool, value = true);
+ NDNBOOST_STATIC_CONSTANT(bool, value = true);
};
template<>
struct is_set_c_arg<LONG_MAX>
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
template<
@@ -479,7 +479,7 @@
>
struct set_c_count_args
{
- BOOST_STATIC_CONSTANT(int, value =
+ NDNBOOST_STATIC_CONSTANT(int, value =
is_set_c_arg<C1>::value + is_set_c_arg<C2>::value
+ is_set_c_arg<C3>::value + is_set_c_arg<C4>::value
+ is_set_c_arg<C5>::value + is_set_c_arg<C6>::value
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/shift_left.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/shift_left.hpp
index cc05688..e81999a 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/shift_left.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/shift_left.hpp
@@ -16,8 +16,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct shift_left_impl
: if_c<
@@ -34,7 +34,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -43,7 +43,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -52,7 +52,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -62,8 +62,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct shift_left
: aux::msvc_eti_base< typename apply_wrap2<
@@ -76,11 +76,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, shift_left, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, shift_left, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, shift_left)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, shift_left)
}}
@@ -90,7 +90,7 @@
template< typename T, typename Shift, T n, Shift s >
struct shift_left_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n << s));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n << s));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/shift_right.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/shift_right.hpp
index d663d51..3db60a6 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/shift_right.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/shift_right.hpp
@@ -16,8 +16,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct shift_right_impl
: if_c<
@@ -34,7 +34,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -43,7 +43,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -52,7 +52,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -62,8 +62,8 @@
};
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct shift_right
: aux::msvc_eti_base< typename apply_wrap2<
@@ -76,11 +76,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, shift_right, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, shift_right, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 2, shift_right)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 2, shift_right)
}}
@@ -90,7 +90,7 @@
template< typename T, typename Shift, T n, Shift s >
struct shift_right_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n >> s));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n >> s));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/times.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/times.hpp
index ade26a2..dbecb60 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/times.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/times.hpp
@@ -15,8 +15,8 @@
typename Tag1
, typename Tag2
- , BOOST_MPL_AUX_NTTP_DECL(int, tag1_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
- , BOOST_MPL_AUX_NTTP_DECL(int, tag2_) = BOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag1_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag1)::value
+ , NDNBOOST_MPL_AUX_NTTP_DECL(int, tag2_) = NDNBOOST_MPL_AUX_MSVC_VALUE_WKND(Tag2)::value
>
struct times_impl
: if_c<
@@ -33,7 +33,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -42,7 +42,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -51,7 +51,7 @@
template< typename U1, typename U2 > struct apply
{
typedef apply type;
- BOOST_STATIC_CONSTANT(int, value = 0);
+ NDNBOOST_STATIC_CONSTANT(int, value = 0);
};
};
@@ -63,14 +63,14 @@
/// forward declaration
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
>
struct times2;
template<
- typename BOOST_MPL_AUX_NA_PARAM(N1)
- , typename BOOST_MPL_AUX_NA_PARAM(N2)
+ typename NDNBOOST_MPL_AUX_NA_PARAM(N1)
+ , typename NDNBOOST_MPL_AUX_NA_PARAM(N2)
, typename N3 = na, typename N4 = na, typename N5 = na
>
struct times
@@ -86,7 +86,7 @@
>::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(
5
, times
, ( N1, N2, N3, N4, N5 )
@@ -108,11 +108,11 @@
>::type >::type
{
- BOOST_MPL_AUX_LAMBDA_SUPPORT(2, times2, (N1, N2))
+ NDNBOOST_MPL_AUX_LAMBDA_SUPPORT(2, times2, (N1, N2))
};
-BOOST_MPL_AUX_NA_SPEC2(2, 5, times)
+NDNBOOST_MPL_AUX_NA_SPEC2(2, 5, times)
}}
@@ -122,7 +122,7 @@
template< typename T, T n1, T n2 >
struct times_wknd
{
- BOOST_STATIC_CONSTANT(T, value = (n1 * n2));
+ NDNBOOST_STATIC_CONSTANT(T, value = (n1 * n2));
typedef integral_c< T,value > type;
};
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp
index bee7472..dcdb46e 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp
@@ -13,7 +13,7 @@
namespace aux {
-template< BOOST_MPL_AUX_NTTP_DECL(int, size) > struct unpack_args_impl
+template< NDNBOOST_MPL_AUX_NTTP_DECL(int, size) > struct unpack_args_impl
{
template< typename F, typename Args > struct apply;
};
@@ -103,7 +103,7 @@
};
};
-BOOST_MPL_AUX_PASS_THROUGH_LAMBDA_SPEC(1, unpack_args)
+NDNBOOST_MPL_AUX_PASS_THROUGH_LAMBDA_SPEC(1, unpack_args)
}}
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/vector.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/vector.hpp
index bdee923..acb6704 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/vector.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/vector.hpp
@@ -484,13 +484,13 @@
template< typename T >
struct is_vector_arg
{
- BOOST_STATIC_CONSTANT(bool, value = true);
+ NDNBOOST_STATIC_CONSTANT(bool, value = true);
};
template<>
struct is_vector_arg<na>
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
template<
@@ -501,7 +501,7 @@
>
struct vector_count_args
{
- BOOST_STATIC_CONSTANT(int, value =
+ NDNBOOST_STATIC_CONSTANT(int, value =
is_vector_arg<T1>::value + is_vector_arg<T2>::value
+ is_vector_arg<T3>::value + is_vector_arg<T4>::value
+ is_vector_arg<T5>::value + is_vector_arg<T6>::value
diff --git a/include/ndnboost/mpl/aux_/preprocessed/msvc60/vector_c.hpp b/include/ndnboost/mpl/aux_/preprocessed/msvc60/vector_c.hpp
index 7e645b9..c654c6f 100644
--- a/include/ndnboost/mpl/aux_/preprocessed/msvc60/vector_c.hpp
+++ b/include/ndnboost/mpl/aux_/preprocessed/msvc60/vector_c.hpp
@@ -463,13 +463,13 @@
template< long C >
struct is_vector_c_arg
{
- BOOST_STATIC_CONSTANT(bool, value = true);
+ NDNBOOST_STATIC_CONSTANT(bool, value = true);
};
template<>
struct is_vector_c_arg<LONG_MAX>
{
- BOOST_STATIC_CONSTANT(bool, value = false);
+ NDNBOOST_STATIC_CONSTANT(bool, value = false);
};
template<
@@ -479,7 +479,7 @@
>
struct vector_c_count_args
{
- BOOST_STATIC_CONSTANT(int, value =
+ NDNBOOST_STATIC_CONSTANT(int, value =
is_vector_c_arg<C1>::value + is_vector_c_arg<C2>::value
+ is_vector_c_arg<C3>::value + is_vector_c_arg<C4>::value
+ is_vector_c_arg<C5>::value + is_vector_c_arg<C6>::value