ndnboost: Also rename BOOST_ to NDNBOOST_
diff --git a/include/ndnboost/algorithm/string/detail/find_format.hpp b/include/ndnboost/algorithm/string/detail/find_format.hpp
index 395beaf..e59e40d 100644
--- a/include/ndnboost/algorithm/string/detail/find_format.hpp
+++ b/include/ndnboost/algorithm/string/detail/find_format.hpp
@@ -8,8 +8,8 @@
// See http://www.boost.org/ for updates, documentation, and revision history.
-#ifndef BOOST_STRING_FIND_FORMAT_DETAIL_HPP
-#define BOOST_STRING_FIND_FORMAT_DETAIL_HPP
+#ifndef NDNBOOST_STRING_FIND_FORMAT_DETAIL_HPP
+#define NDNBOOST_STRING_FIND_FORMAT_DETAIL_HPP
#include <ndnboost/algorithm/string/config.hpp>
#include <ndnboost/range/iterator_range.hpp>
@@ -38,7 +38,7 @@
const FormatResultT& FormatResult )
{
typedef find_format_store<
- BOOST_STRING_TYPENAME
+ NDNBOOST_STRING_TYPENAME
range_const_iterator<InputT>::type,
FormatterT,
FormatResultT > store_type;
@@ -102,7 +102,7 @@
const FormatResultT& FormatResult)
{
typedef find_format_store<
- BOOST_STRING_TYPENAME
+ NDNBOOST_STRING_TYPENAME
range_const_iterator<InputT>::type,
FormatterT,
FormatResultT > store_type;
@@ -161,7 +161,7 @@
const FormatResultT& FormatResult)
{
typedef find_format_store<
- BOOST_STRING_TYPENAME
+ NDNBOOST_STRING_TYPENAME
range_iterator<InputT>::type,
FormatterT,
FormatResultT > store_type;
@@ -201,4 +201,4 @@
} // namespace algorithm
} // namespace ndnboost
-#endif // BOOST_STRING_FIND_FORMAT_DETAIL_HPP
+#endif // NDNBOOST_STRING_FIND_FORMAT_DETAIL_HPP
diff --git a/include/ndnboost/algorithm/string/detail/find_format_all.hpp b/include/ndnboost/algorithm/string/detail/find_format_all.hpp
index ee0312a..22d0768 100644
--- a/include/ndnboost/algorithm/string/detail/find_format_all.hpp
+++ b/include/ndnboost/algorithm/string/detail/find_format_all.hpp
@@ -8,8 +8,8 @@
// See http://www.boost.org/ for updates, documentation, and revision history.
-#ifndef BOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP
-#define BOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP
+#ifndef NDNBOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP
+#define NDNBOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP
#include <ndnboost/algorithm/string/config.hpp>
#include <ndnboost/range/iterator_range.hpp>
@@ -39,7 +39,7 @@
const FindResultT& FindResult,
const FormatResultT& FormatResult )
{
- typedef BOOST_STRING_TYPENAME
+ typedef NDNBOOST_STRING_TYPENAME
range_const_iterator<InputT>::type input_iterator_type;
typedef find_format_store<
@@ -113,7 +113,7 @@
const FindResultT& FindResult,
const FormatResultT& FormatResult)
{
- typedef BOOST_STRING_TYPENAME
+ typedef NDNBOOST_STRING_TYPENAME
range_const_iterator<InputT>::type input_iterator_type;
typedef find_format_store<
@@ -187,7 +187,7 @@
FindResultT FindResult,
FormatResultT FormatResult)
{
- typedef BOOST_STRING_TYPENAME
+ typedef NDNBOOST_STRING_TYPENAME
range_iterator<InputT>::type input_iterator_type;
typedef find_format_store<
input_iterator_type,
@@ -199,7 +199,7 @@
// Instantiate replacement storage
std::deque<
- BOOST_STRING_TYPENAME range_value<InputT>::type> Storage;
+ NDNBOOST_STRING_TYPENAME range_value<InputT>::type> Storage;
// Initialize replacement iterators
input_iterator_type InsertIt=::ndnboost::begin(Input);
@@ -270,4 +270,4 @@
} // namespace algorithm
} // namespace ndnboost
-#endif // BOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP
+#endif // NDNBOOST_STRING_FIND_FORMAT_ALL_DETAIL_HPP
diff --git a/include/ndnboost/algorithm/string/detail/find_format_store.hpp b/include/ndnboost/algorithm/string/detail/find_format_store.hpp
index d0d38bf..89c137f 100644
--- a/include/ndnboost/algorithm/string/detail/find_format_store.hpp
+++ b/include/ndnboost/algorithm/string/detail/find_format_store.hpp
@@ -8,8 +8,8 @@
// See http://www.boost.org/ for updates, documentation, and revision history.
-#ifndef BOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP
-#define BOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP
+#ifndef NDNBOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP
+#define NDNBOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP
#include <ndnboost/algorithm/string/config.hpp>
#include <ndnboost/range/iterator_range.hpp>
@@ -20,7 +20,7 @@
// temporary format and find result storage --------------------------------//
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if NDNBOOST_WORKAROUND(NDNBOOST_MSVC, >= 1400)
#pragma warning(push)
#pragma warning(disable:4512) //assignment operator could not be generated
#endif
@@ -73,17 +73,17 @@
template<typename InputT, typename FindResultT>
bool check_find_result(InputT&, FindResultT& FindResult)
{
- typedef BOOST_STRING_TYPENAME
+ typedef NDNBOOST_STRING_TYPENAME
range_const_iterator<InputT>::type input_iterator_type;
iterator_range<input_iterator_type> ResultRange(FindResult);
return !ResultRange.empty();
}
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#if NDNBOOST_WORKAROUND(NDNBOOST_MSVC, >= 1400)
#pragma warning(pop)
#endif
} // namespace detail
} // namespace algorithm
} // namespace ndnboost
-#endif // BOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP
+#endif // NDNBOOST_STRING_FIND_FORMAT_STORE_DETAIL_HPP
diff --git a/include/ndnboost/algorithm/string/detail/finder.hpp b/include/ndnboost/algorithm/string/detail/finder.hpp
index 330c7a5..6446e92 100644
--- a/include/ndnboost/algorithm/string/detail/finder.hpp
+++ b/include/ndnboost/algorithm/string/detail/finder.hpp
@@ -8,8 +8,8 @@
// See http://www.boost.org/ for updates, documentation, and revision history.
-#ifndef BOOST_STRING_FINDER_DETAIL_HPP
-#define BOOST_STRING_FINDER_DETAIL_HPP
+#ifndef NDNBOOST_STRING_FINDER_DETAIL_HPP
+#define NDNBOOST_STRING_FINDER_DETAIL_HPP
#include <ndnboost/algorithm/string/config.hpp>
#include <ndnboost/algorithm/string/constants.hpp>
@@ -127,7 +127,7 @@
if( ndnboost::empty(m_Search) )
return result_type( End, End );
- typedef BOOST_STRING_TYPENAME ndnboost::detail::
+ typedef NDNBOOST_STRING_TYPENAME ndnboost::detail::
iterator_traits<ForwardIteratorT>::iterator_category category;
return findit( Begin, End, category() );
@@ -379,7 +379,7 @@
ForwardIteratorT End,
unsigned int N )
{
- typedef BOOST_STRING_TYPENAME ndnboost::detail::
+ typedef NDNBOOST_STRING_TYPENAME ndnboost::detail::
iterator_traits<ForwardIteratorT>::iterator_category category;
return ::ndnboost::algorithm::detail::find_head_impl( Begin, End, N, category() );
@@ -453,7 +453,7 @@
ForwardIteratorT End,
unsigned int N )
{
- typedef BOOST_STRING_TYPENAME ndnboost::detail::
+ typedef NDNBOOST_STRING_TYPENAME ndnboost::detail::
iterator_traits<ForwardIteratorT>::iterator_category category;
return ::ndnboost::algorithm::detail::find_tail_impl( Begin, End, N, category() );
@@ -625,9 +625,9 @@
ForwardIterator2T,
ForwardIterator2T ) const
{
-#if BOOST_WORKAROUND( __MWERKS__, <= 0x3003 )
+#if NDNBOOST_WORKAROUND( __MWERKS__, <= 0x3003 )
return iterator_range<const ForwardIterator2T>(this->m_Range);
-#elif BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+#elif NDNBOOST_WORKAROUND(NDNBOOST_MSVC, <= 1300)
return iterator_range<ForwardIterator2T>(m_Range.begin(), m_Range.end());
#else
return m_Range;
@@ -643,4 +643,4 @@
} // namespace algorithm
} // namespace ndnboost
-#endif // BOOST_STRING_FINDER_DETAIL_HPP
+#endif // NDNBOOST_STRING_FINDER_DETAIL_HPP
diff --git a/include/ndnboost/algorithm/string/detail/formatter.hpp b/include/ndnboost/algorithm/string/detail/formatter.hpp
index 0307310..14e5dee 100644
--- a/include/ndnboost/algorithm/string/detail/formatter.hpp
+++ b/include/ndnboost/algorithm/string/detail/formatter.hpp
@@ -8,8 +8,8 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#ifndef BOOST_STRING_FORMATTER_DETAIL_HPP
-#define BOOST_STRING_FORMATTER_DETAIL_HPP
+#ifndef NDNBOOST_STRING_FORMATTER_DETAIL_HPP
+#define NDNBOOST_STRING_FORMATTER_DETAIL_HPP
#include <ndnboost/range/iterator_range.hpp>
@@ -32,7 +32,7 @@
struct const_formatF
{
private:
- typedef BOOST_STRING_TYPENAME
+ typedef NDNBOOST_STRING_TYPENAME
range_const_iterator<RangeT>::type format_iterator;
typedef iterator_range<format_iterator> result_type;
@@ -42,7 +42,7 @@
m_Format(::ndnboost::begin(Format), ::ndnboost::end(Format)) {}
// Operation
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if NDNBOOST_WORKAROUND(__BORLANDC__, NDNBOOST_TESTED_AT(0x564))
template<typename Range2T>
result_type& operator()(const Range2T&)
{
@@ -101,7 +101,7 @@
// Operation
template<typename RangeT>
inline iterator_range<
- BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type>
+ NDNBOOST_STRING_TYPENAME range_const_iterator<RangeT>::type>
operator()(const RangeT& Replace) const
{
return m_Finder(::ndnboost::begin(Replace), ::ndnboost::end(Replace));
@@ -116,4 +116,4 @@
} // namespace algorithm
} // namespace ndnboost
-#endif // BOOST_STRING_FORMATTER_DETAIL_HPP
+#endif // NDNBOOST_STRING_FORMATTER_DETAIL_HPP
diff --git a/include/ndnboost/algorithm/string/detail/replace_storage.hpp b/include/ndnboost/algorithm/string/detail/replace_storage.hpp
index 6fb6c54..274d858 100644
--- a/include/ndnboost/algorithm/string/detail/replace_storage.hpp
+++ b/include/ndnboost/algorithm/string/detail/replace_storage.hpp
@@ -8,8 +8,8 @@
// See http://www.boost.org/ for updates, documentation, and revision history.
-#ifndef BOOST_STRING_REPLACE_STORAGE_DETAIL_HPP
-#define BOOST_STRING_REPLACE_STORAGE_DETAIL_HPP
+#ifndef NDNBOOST_STRING_REPLACE_STORAGE_DETAIL_HPP
+#define NDNBOOST_STRING_REPLACE_STORAGE_DETAIL_HPP
#include <ndnboost/algorithm/string/config.hpp>
#include <algorithm>
@@ -156,4 +156,4 @@
} // namespace algorithm
} // namespace ndnboost
-#endif // BOOST_STRING_REPLACE_STORAGE_DETAIL_HPP
+#endif // NDNBOOST_STRING_REPLACE_STORAGE_DETAIL_HPP
diff --git a/include/ndnboost/algorithm/string/detail/sequence.hpp b/include/ndnboost/algorithm/string/detail/sequence.hpp
index 0b39a8b..be67f29 100644
--- a/include/ndnboost/algorithm/string/detail/sequence.hpp
+++ b/include/ndnboost/algorithm/string/detail/sequence.hpp
@@ -8,8 +8,8 @@
// See http://www.boost.org/ for updates, documentation, and revision history.
-#ifndef BOOST_STRING_DETAIL_SEQUENCE_HPP
-#define BOOST_STRING_DETAIL_SEQUENCE_HPP
+#ifndef NDNBOOST_STRING_DETAIL_SEQUENCE_HPP
+#define NDNBOOST_STRING_DETAIL_SEQUENCE_HPP
#include <ndnboost/algorithm/string/config.hpp>
#include <ndnboost/mpl/bool.hpp>
@@ -28,7 +28,7 @@
template< typename InputT, typename ForwardIteratorT >
inline void insert(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator At,
+ NDNBOOST_STRING_TYPENAME InputT::iterator At,
ForwardIteratorT Begin,
ForwardIteratorT End )
{
@@ -38,7 +38,7 @@
template< typename InputT, typename InsertT >
inline void insert(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator At,
+ NDNBOOST_STRING_TYPENAME InputT::iterator At,
const InsertT& Insert )
{
::ndnboost::algorithm::detail::insert( Input, At, ::ndnboost::begin(Insert), ::ndnboost::end(Insert) );
@@ -53,8 +53,8 @@
template< typename InputT >
inline typename InputT::iterator erase(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator From,
- BOOST_STRING_TYPENAME InputT::iterator To )
+ NDNBOOST_STRING_TYPENAME InputT::iterator From,
+ NDNBOOST_STRING_TYPENAME InputT::iterator To )
{
return Input.erase( From, To );
}
@@ -69,14 +69,14 @@
template< typename InputT, typename ForwardIteratorT >
void operator()(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator From,
- BOOST_STRING_TYPENAME InputT::iterator To,
+ NDNBOOST_STRING_TYPENAME InputT::iterator From,
+ NDNBOOST_STRING_TYPENAME InputT::iterator To,
ForwardIteratorT Begin,
ForwardIteratorT End )
{
// Copy data to the container ( as much as possible )
ForwardIteratorT InsertIt=Begin;
- BOOST_STRING_TYPENAME InputT::iterator InputIt=From;
+ NDNBOOST_STRING_TYPENAME InputT::iterator InputIt=From;
for(; InsertIt!=End && InputIt!=To; InsertIt++, InputIt++ )
{
*InputIt=*InsertIt;
@@ -105,12 +105,12 @@
template< typename InputT, typename ForwardIteratorT >
void operator()(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator From,
- BOOST_STRING_TYPENAME InputT::iterator To,
+ NDNBOOST_STRING_TYPENAME InputT::iterator From,
+ NDNBOOST_STRING_TYPENAME InputT::iterator To,
ForwardIteratorT Begin,
ForwardIteratorT End )
{
- BOOST_STRING_TYPENAME InputT::iterator At=Input.erase( From, To );
+ NDNBOOST_STRING_TYPENAME InputT::iterator At=Input.erase( From, To );
if ( Begin!=End )
{
if(!Input.empty())
@@ -132,8 +132,8 @@
template< typename InputT, typename ForwardIteratorT >
void operator()(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator From,
- BOOST_STRING_TYPENAME InputT::iterator To,
+ NDNBOOST_STRING_TYPENAME InputT::iterator From,
+ NDNBOOST_STRING_TYPENAME InputT::iterator To,
ForwardIteratorT Begin,
ForwardIteratorT End )
{
@@ -152,8 +152,8 @@
template< typename InputT, typename ForwardIteratorT >
void operator()(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator From,
- BOOST_STRING_TYPENAME InputT::iterator To,
+ NDNBOOST_STRING_TYPENAME InputT::iterator From,
+ NDNBOOST_STRING_TYPENAME InputT::iterator To,
ForwardIteratorT Begin,
ForwardIteratorT End )
{
@@ -166,8 +166,8 @@
template< typename InputT, typename ForwardIteratorT >
inline void replace(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator From,
- BOOST_STRING_TYPENAME InputT::iterator To,
+ NDNBOOST_STRING_TYPENAME InputT::iterator From,
+ NDNBOOST_STRING_TYPENAME InputT::iterator To,
ForwardIteratorT Begin,
ForwardIteratorT End )
{
@@ -178,8 +178,8 @@
template< typename InputT, typename InsertT >
inline void replace(
InputT& Input,
- BOOST_STRING_TYPENAME InputT::iterator From,
- BOOST_STRING_TYPENAME InputT::iterator To,
+ NDNBOOST_STRING_TYPENAME InputT::iterator From,
+ NDNBOOST_STRING_TYPENAME InputT::iterator To,
const InsertT& Insert )
{
if(From!=To)
@@ -197,4 +197,4 @@
} // namespace ndnboost
-#endif // BOOST_STRING_DETAIL_SEQUENCE_HPP
+#endif // NDNBOOST_STRING_DETAIL_SEQUENCE_HPP
diff --git a/include/ndnboost/algorithm/string/detail/util.hpp b/include/ndnboost/algorithm/string/detail/util.hpp
index fa34548..c83893d 100644
--- a/include/ndnboost/algorithm/string/detail/util.hpp
+++ b/include/ndnboost/algorithm/string/detail/util.hpp
@@ -8,8 +8,8 @@
// See http://www.boost.org/ for updates, documentation, and revision history.
-#ifndef BOOST_STRING_UTIL_DETAIL_HPP
-#define BOOST_STRING_UTIL_DETAIL_HPP
+#ifndef NDNBOOST_STRING_UTIL_DETAIL_HPP
+#define NDNBOOST_STRING_UTIL_DETAIL_HPP
#include <ndnboost/algorithm/string/config.hpp>
#include <functional>
@@ -88,7 +88,7 @@
// copy range functor
template<
typename SeqT,
- typename IteratorT=BOOST_STRING_TYPENAME SeqT::const_iterator >
+ typename IteratorT=NDNBOOST_STRING_TYPENAME SeqT::const_iterator >
struct copy_iterator_rangeF :
public std::unary_function< iterator_range<IteratorT>, SeqT >
{
@@ -103,4 +103,4 @@
} // namespace ndnboost
-#endif // BOOST_STRING_UTIL_DETAIL_HPP
+#endif // NDNBOOST_STRING_UTIL_DETAIL_HPP