ndnboost: Also rename BOOST_ to NDNBOOST_
diff --git a/include/ndnboost/config/compiler/visualc.hpp b/include/ndnboost/config/compiler/visualc.hpp
index a7d3025..1ba9d16 100644
--- a/include/ndnboost/config/compiler/visualc.hpp
+++ b/include/ndnboost/config/compiler/visualc.hpp
@@ -20,15 +20,15 @@
// No other comparisons (==, >, or <=) are safe.
//
-#define BOOST_MSVC _MSC_VER
+#define NDNBOOST_MSVC _MSC_VER
//
-// Helper macro BOOST_MSVC_FULL_VER for use in Boost code:
+// Helper macro NDNBOOST_MSVC_FULL_VER for use in Boost code:
//
#if _MSC_FULL_VER > 100000000
-# define BOOST_MSVC_FULL_VER _MSC_FULL_VER
+# define NDNBOOST_MSVC_FULL_VER _MSC_FULL_VER
#else
-# define BOOST_MSVC_FULL_VER (_MSC_FULL_VER * 10)
+# define NDNBOOST_MSVC_FULL_VER (_MSC_FULL_VER * 10)
#endif
// Attempt to suppress VC6 warnings about the length of decorated names (obsolete):
@@ -43,53 +43,53 @@
#if _MSC_VER < 1300 // 1200 == VC++ 6.0, 1200-1202 == eVC++4
# pragma warning( disable : 4786 ) // ident trunc to '255' chars in debug info
-# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
-# define BOOST_NO_VOID_RETURNS
-# define BOOST_NO_EXCEPTION_STD_NAMESPACE
+# define NDNBOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
+# define NDNBOOST_NO_VOID_RETURNS
+# define NDNBOOST_NO_EXCEPTION_STD_NAMESPACE
# if _MSC_VER == 1202
-# define BOOST_NO_STD_TYPEINFO
+# define NDNBOOST_NO_STD_TYPEINFO
# endif
#endif
/// Visual Studio has no fenv.h
-#define BOOST_NO_FENV_H
+#define NDNBOOST_NO_FENV_H
#if (_MSC_VER < 1310) // 130X == VC++ 7.0
-# if !defined(_MSC_EXTENSIONS) && !defined(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS) // VC7 bug with /Za
-# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
+# if !defined(_MSC_EXTENSIONS) && !defined(NDNBOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS) // VC7 bug with /Za
+# define NDNBOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
# endif
-# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
-# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-# define BOOST_NO_PRIVATE_IN_AGGREGATE
-# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-# define BOOST_NO_INTEGRAL_INT64_T
-# define BOOST_NO_DEDUCED_TYPENAME
-# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
+# define NDNBOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
+# define NDNBOOST_NO_INCLASS_MEMBER_INITIALIZATION
+# define NDNBOOST_NO_PRIVATE_IN_AGGREGATE
+# define NDNBOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+# define NDNBOOST_NO_INTEGRAL_INT64_T
+# define NDNBOOST_NO_DEDUCED_TYPENAME
+# define NDNBOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
// VC++ 6/7 has member templates but they have numerous problems including
// cases of silent failure, so for safety we define:
-# define BOOST_NO_MEMBER_TEMPLATES
+# define NDNBOOST_NO_MEMBER_TEMPLATES
// For VC++ experts wishing to attempt workarounds, we define:
-# define BOOST_MSVC6_MEMBER_TEMPLATES
+# define NDNBOOST_MSVC6_MEMBER_TEMPLATES
-# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-# define BOOST_NO_CV_VOID_SPECIALIZATIONS
-# define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-# define BOOST_NO_USING_TEMPLATE
-# define BOOST_NO_SWPRINTF
-# define BOOST_NO_TEMPLATE_TEMPLATES
-# define BOOST_NO_SFINAE
-# define BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS
-# define BOOST_NO_IS_ABSTRACT
-# define BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS
+# define NDNBOOST_NO_MEMBER_TEMPLATE_FRIENDS
+# define NDNBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+# define NDNBOOST_NO_CV_VOID_SPECIALIZATIONS
+# define NDNBOOST_NO_FUNCTION_TEMPLATE_ORDERING
+# define NDNBOOST_NO_USING_TEMPLATE
+# define NDNBOOST_NO_SWPRINTF
+# define NDNBOOST_NO_TEMPLATE_TEMPLATES
+# define NDNBOOST_NO_SFINAE
+# define NDNBOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS
+# define NDNBOOST_NO_IS_ABSTRACT
+# define NDNBOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS
// TODO: what version is meant here? Have there really been any fixes in cl 12.01 (as e.g. shipped with eVC4)?
# if (_MSC_VER >= 1300)
-# define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
+# define NDNBOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
# endif
#endif
@@ -97,25 +97,25 @@
#if _MSC_VER < 1400
// although a conforming signature for swprint exists in VC7.1
// it appears not to actually work:
-# define BOOST_NO_SWPRINTF
+# define NDNBOOST_NO_SWPRINTF
// Our extern template tests also fail for this compiler:
-# define BOOST_NO_CXX11_EXTERN_TEMPLATE
+# define NDNBOOST_NO_CXX11_EXTERN_TEMPLATE
// Variadic macros do not exist for VC7.1 and lower
-# define BOOST_NO_CXX11_VARIADIC_MACROS
+# define NDNBOOST_NO_CXX11_VARIADIC_MACROS
#endif
#if defined(UNDER_CE)
// Windows CE does not have a conforming signature for swprintf
-# define BOOST_NO_SWPRINTF
+# define NDNBOOST_NO_SWPRINTF
#endif
#if _MSC_VER < 1500 // 140X == VC++ 8.0
-# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+# define NDNBOOST_NO_MEMBER_TEMPLATE_FRIENDS
#endif
#if _MSC_VER < 1600 // 150X == VC++ 9.0
// A bug in VC9:
-# define BOOST_NO_ADL_BARRIER
+# define NDNBOOST_NO_ADL_BARRIER
#endif
@@ -132,128 +132,128 @@
// https://connect.microsoft.com/VisualStudio/feedback/details/100744
// See also: http://www.boost.org/libs/utility/value_init.htm#compiler_issues
// (Niels Dekker, LKEB, May 2010)
-# define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
+# define NDNBOOST_NO_COMPLETE_VALUE_INITIALIZATION
#ifndef _NATIVE_WCHAR_T_DEFINED
-# define BOOST_NO_INTRINSIC_WCHAR_T
+# define NDNBOOST_NO_INTRINSIC_WCHAR_T
#endif
#if defined(_WIN32_WCE) || defined(UNDER_CE)
-# define BOOST_NO_SWPRINTF
+# define NDNBOOST_NO_SWPRINTF
#endif
// we have ThreadEx or GetSystemTimeAsFileTime unless we're running WindowsCE
#if !defined(_WIN32_WCE) && !defined(UNDER_CE)
-# define BOOST_HAS_THREADEX
-# define BOOST_HAS_GETSYSTEMTIMEASFILETIME
+# define NDNBOOST_HAS_THREADEX
+# define NDNBOOST_HAS_GETSYSTEMTIMEASFILETIME
#endif
//
// check for exception handling support:
-#if !defined(_CPPUNWIND) && !defined(BOOST_NO_EXCEPTIONS)
-# define BOOST_NO_EXCEPTIONS
+#if !defined(_CPPUNWIND) && !defined(NDNBOOST_NO_EXCEPTIONS)
+# define NDNBOOST_NO_EXCEPTIONS
#endif
//
// __int64 support:
//
#if (_MSC_VER >= 1200)
-# define BOOST_HAS_MS_INT64
+# define NDNBOOST_HAS_MS_INT64
#endif
#if (_MSC_VER >= 1310) && (defined(_MSC_EXTENSIONS) || (_MSC_VER >= 1400))
-# define BOOST_HAS_LONG_LONG
+# define NDNBOOST_HAS_LONG_LONG
#else
-# define BOOST_NO_LONG_LONG
+# define NDNBOOST_NO_LONG_LONG
#endif
#if (_MSC_VER >= 1400) && !defined(_DEBUG)
-# define BOOST_HAS_NRVO
+# define NDNBOOST_HAS_NRVO
#endif
//
// disable Win32 API's if compiler extentions are
// turned off:
//
-#if !defined(_MSC_EXTENSIONS) && !defined(BOOST_DISABLE_WIN32)
-# define BOOST_DISABLE_WIN32
+#if !defined(_MSC_EXTENSIONS) && !defined(NDNBOOST_DISABLE_WIN32)
+# define NDNBOOST_DISABLE_WIN32
#endif
-#if !defined(_CPPRTTI) && !defined(BOOST_NO_RTTI)
-# define BOOST_NO_RTTI
+#if !defined(_CPPRTTI) && !defined(NDNBOOST_NO_RTTI)
+# define NDNBOOST_NO_RTTI
#endif
//
// TR1 features:
//
#if _MSC_VER >= 1700
-// # define BOOST_HAS_TR1_HASH // don't know if this is true yet.
-// # define BOOST_HAS_TR1_TYPE_TRAITS // don't know if this is true yet.
-# define BOOST_HAS_TR1_UNORDERED_MAP
-# define BOOST_HAS_TR1_UNORDERED_SET
+// # define NDNBOOST_HAS_TR1_HASH // don't know if this is true yet.
+// # define NDNBOOST_HAS_TR1_TYPE_TRAITS // don't know if this is true yet.
+# define NDNBOOST_HAS_TR1_UNORDERED_MAP
+# define NDNBOOST_HAS_TR1_UNORDERED_SET
#endif
//
// C++0x features
//
-// See above for BOOST_NO_LONG_LONG
+// See above for NDNBOOST_NO_LONG_LONG
// C++ features supported by VC++ 10 (aka 2010)
//
#if _MSC_VER < 1600
-# define BOOST_NO_CXX11_AUTO_DECLARATIONS
-# define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
-# define BOOST_NO_CXX11_LAMBDAS
-# define BOOST_NO_CXX11_RVALUE_REFERENCES
-# define BOOST_NO_CXX11_STATIC_ASSERT
-# define BOOST_NO_CXX11_NULLPTR
-# define BOOST_NO_CXX11_DECLTYPE
+# define NDNBOOST_NO_CXX11_AUTO_DECLARATIONS
+# define NDNBOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
+# define NDNBOOST_NO_CXX11_LAMBDAS
+# define NDNBOOST_NO_CXX11_RVALUE_REFERENCES
+# define NDNBOOST_NO_CXX11_STATIC_ASSERT
+# define NDNBOOST_NO_CXX11_NULLPTR
+# define NDNBOOST_NO_CXX11_DECLTYPE
#endif // _MSC_VER < 1600
#if _MSC_VER >= 1600
-# define BOOST_HAS_STDINT_H
+# define NDNBOOST_HAS_STDINT_H
#endif
// C++ features supported by VC++ 11 (aka 2012)
//
#if _MSC_VER < 1700
-# define BOOST_NO_CXX11_RANGE_BASED_FOR
-# define BOOST_NO_CXX11_SCOPED_ENUMS
+# define NDNBOOST_NO_CXX11_RANGE_BASED_FOR
+# define NDNBOOST_NO_CXX11_SCOPED_ENUMS
#endif // _MSC_VER < 1700
// C++11 features supported by VC++ 11 (aka 2012) November 2012 CTP
// Because the CTP is unsupported, unrelease, and only alpha quality,
-// it is only supported if BOOST_MSVC_ENABLE_2012_NOV_CTP is defined.
+// it is only supported if NDNBOOST_MSVC_ENABLE_2012_NOV_CTP is defined.
//
-#if _MSC_FULL_VER < 170051025 || !defined(BOOST_MSVC_ENABLE_2012_NOV_CTP)
-# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
-# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-# define BOOST_NO_CXX11_RAW_LITERALS
-# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
+#if _MSC_FULL_VER < 170051025 || !defined(NDNBOOST_MSVC_ENABLE_2012_NOV_CTP)
+# define NDNBOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+# define NDNBOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+# define NDNBOOST_NO_CXX11_RAW_LITERALS
+# define NDNBOOST_NO_CXX11_VARIADIC_TEMPLATES
+# define NDNBOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#endif
// C++11 features not supported by any versions
-#define BOOST_NO_CXX11_CHAR16_T
-#define BOOST_NO_CXX11_CHAR32_T
-#define BOOST_NO_CXX11_CONSTEXPR
-#define BOOST_NO_CXX11_DECLTYPE_N3276
-#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-#define BOOST_NO_CXX11_DELETED_FUNCTIONS
-#define BOOST_NO_CXX11_NOEXCEPT
-#define BOOST_NO_CXX11_TEMPLATE_ALIASES
-#define BOOST_NO_CXX11_UNICODE_LITERALS
-#define BOOST_NO_SFINAE_EXPR
-#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
-#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#define NDNBOOST_NO_CXX11_CHAR16_T
+#define NDNBOOST_NO_CXX11_CHAR32_T
+#define NDNBOOST_NO_CXX11_CONSTEXPR
+#define NDNBOOST_NO_CXX11_DECLTYPE_N3276
+#define NDNBOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#define NDNBOOST_NO_CXX11_DELETED_FUNCTIONS
+#define NDNBOOST_NO_CXX11_NOEXCEPT
+#define NDNBOOST_NO_CXX11_TEMPLATE_ALIASES
+#define NDNBOOST_NO_CXX11_UNICODE_LITERALS
+#define NDNBOOST_NO_SFINAE_EXPR
+#define NDNBOOST_NO_TWO_PHASE_NAME_LOOKUP
+#define NDNBOOST_NO_CXX11_USER_DEFINED_LITERALS
//
// prefix and suffix headers:
//
-#ifndef BOOST_ABI_PREFIX
-# define BOOST_ABI_PREFIX "ndnboost/config/abi/msvc_prefix.hpp"
+#ifndef NDNBOOST_ABI_PREFIX
+# define NDNBOOST_ABI_PREFIX "ndnboost/config/abi/msvc_prefix.hpp"
#endif
-#ifndef BOOST_ABI_SUFFIX
-# define BOOST_ABI_SUFFIX "ndnboost/config/abi/msvc_suffix.hpp"
+#ifndef NDNBOOST_ABI_SUFFIX
+# define NDNBOOST_ABI_SUFFIX "ndnboost/config/abi/msvc_suffix.hpp"
#endif
-#ifndef BOOST_COMPILER
+#ifndef NDNBOOST_COMPILER
// TODO:
// these things are mostly bogus. 1200 means version 12.0 of the compiler. The
// artificial versions assigned to them only refer to the versions of some IDE
@@ -264,24 +264,24 @@
# if _MSC_VER < 1200
// Note: these are so far off, they are not really supported
# elif _MSC_VER < 1300 // eVC++ 4 comes with 1200-1202
-# define BOOST_COMPILER_VERSION evc4.0
+# define NDNBOOST_COMPILER_VERSION evc4.0
# elif _MSC_VER < 1400
// Note: I'm not aware of any CE compiler with version 13xx
-# if defined(BOOST_ASSERT_CONFIG)
+# if defined(NDNBOOST_ASSERT_CONFIG)
# error "Unknown EVC++ compiler version - please run the configure tests and report the results"
# else
# pragma message("Unknown EVC++ compiler version - please run the configure tests and report the results")
# endif
# elif _MSC_VER < 1500
-# define BOOST_COMPILER_VERSION evc8
+# define NDNBOOST_COMPILER_VERSION evc8
# elif _MSC_VER < 1600
-# define BOOST_COMPILER_VERSION evc9
+# define NDNBOOST_COMPILER_VERSION evc9
# elif _MSC_VER < 1700
-# define BOOST_COMPILER_VERSION evc10
+# define NDNBOOST_COMPILER_VERSION evc10
# elif _MSC_VER < 1800
-# define BOOST_COMPILER_VERSION evc11
+# define NDNBOOST_COMPILER_VERSION evc11
# else
-# if defined(BOOST_ASSERT_CONFIG)
+# if defined(NDNBOOST_ASSERT_CONFIG)
# error "Unknown EVC++ compiler version - please run the configure tests and report the results"
# else
# pragma message("Unknown EVC++ compiler version - please run the configure tests and report the results")
@@ -290,33 +290,33 @@
# else
# if _MSC_VER < 1200
// Note: these are so far off, they are not really supported
-# define BOOST_COMPILER_VERSION 5.0
+# define NDNBOOST_COMPILER_VERSION 5.0
# elif _MSC_VER < 1300
-# define BOOST_COMPILER_VERSION 6.0
+# define NDNBOOST_COMPILER_VERSION 6.0
# elif _MSC_VER < 1310
-# define BOOST_COMPILER_VERSION 7.0
+# define NDNBOOST_COMPILER_VERSION 7.0
# elif _MSC_VER < 1400
-# define BOOST_COMPILER_VERSION 7.1
+# define NDNBOOST_COMPILER_VERSION 7.1
# elif _MSC_VER < 1500
-# define BOOST_COMPILER_VERSION 8.0
+# define NDNBOOST_COMPILER_VERSION 8.0
# elif _MSC_VER < 1600
-# define BOOST_COMPILER_VERSION 9.0
+# define NDNBOOST_COMPILER_VERSION 9.0
# elif _MSC_VER < 1700
-# define BOOST_COMPILER_VERSION 10.0
+# define NDNBOOST_COMPILER_VERSION 10.0
# elif _MSC_VER < 1800
-# define BOOST_COMPILER_VERSION 11.0
+# define NDNBOOST_COMPILER_VERSION 11.0
# else
-# define BOOST_COMPILER_VERSION _MSC_VER
+# define NDNBOOST_COMPILER_VERSION _MSC_VER
# endif
# endif
-# define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
+# define NDNBOOST_COMPILER "Microsoft Visual C++ version " NDNBOOST_STRINGIZE(NDNBOOST_COMPILER_VERSION)
#endif
//
// last known and checked version is 1700 (VC11, aka 2011):
#if (_MSC_VER > 1700)
-# if defined(BOOST_ASSERT_CONFIG)
+# if defined(NDNBOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results"
# else
# pragma message("Unknown compiler version - please run the configure tests and report the results")