diff --git a/include/boost/range/config.hpp b/include/boost/range/config.hpp index b4920d1..d51fade 100755 --- a/include/boost/range/config.hpp +++ b/include/boost/range/config.hpp @@ -39,10 +39,10 @@ #endif #ifdef BOOST_RANGE_NO_ARRAY_SUPPORT -#define BOOST_RANGE_ARRAY_REF() (array) +#define BOOST_RANGE_ARRAY_REF() (boost_range_array) #define BOOST_RANGE_NO_STATIC_ASSERT #else -#define BOOST_RANGE_ARRAY_REF() (&array) +#define BOOST_RANGE_ARRAY_REF() (&boost_range_array) #endif diff --git a/include/boost/range/detail/begin.hpp b/include/boost/range/detail/begin.hpp index ff984e7..ab75dc1 100755 --- a/include/boost/range/detail/begin.hpp +++ b/include/boost/range/detail/begin.hpp @@ -60,7 +60,7 @@ namespace boost template< typename T, std::size_t sz > static T* fun( T BOOST_RANGE_ARRAY_REF()[sz] ) { - return array; + return boost_range_array; } }; diff --git a/include/boost/range/detail/empty.hpp b/include/boost/range/detail/empty.hpp index d453e51..b098705 100755 --- a/include/boost/range/detail/empty.hpp +++ b/include/boost/range/detail/empty.hpp @@ -58,7 +58,7 @@ namespace boost template< typename T, std::size_t sz > static bool fun( T BOOST_ARRAY_REF[sz] ) { - if( array == 0 ) + if( boost_range_array == 0 ) return true; return false; } diff --git a/include/boost/range/detail/end.hpp b/include/boost/range/detail/end.hpp index b01d14a..783d5ce 100755 --- a/include/boost/range/detail/end.hpp +++ b/include/boost/range/detail/end.hpp @@ -62,7 +62,7 @@ namespace boost template< typename T, std::size_t sz > static T* fun( T BOOST_RANGE_ARRAY_REF()[sz] ) { - return boost::range_detail::array_end( array ); + return boost::range_detail::array_end( boost_range_array ); } }; @@ -73,7 +73,7 @@ namespace boost template< typename T, std::size_t sz > static T* fun( T BOOST_RANGE_ARRAY_REF()[sz] ) { - return boost::range_detail::array_end( array ); + return boost::range_detail::array_end( boost_range_array ); } }; @@ -83,7 +83,7 @@ namespace boost template< typename T, std::size_t sz > static T* fun( T BOOST_RANGE_ARRAY_REF()[sz] ) { - return boost::range_detail::array_end( array ); + return boost::range_detail::array_end( boost_range_array ); } }; diff --git a/include/boost/range/detail/implementation_help.hpp b/include/boost/range/detail/implementation_help.hpp index 6462815..4db8be4 100755 --- a/include/boost/range/detail/implementation_help.hpp +++ b/include/boost/range/detail/implementation_help.hpp @@ -60,25 +60,25 @@ namespace boost template< class T, std::size_t sz > inline T* array_end( T BOOST_RANGE_ARRAY_REF()[sz], int ) { - return array + sz; + return boost_range_array + sz; } template< class T, std::size_t sz > inline const T* array_end( const T BOOST_RANGE_ARRAY_REF()[sz], int ) { - return array + sz; + return boost_range_array + sz; } template< class T, std::size_t sz > inline T* array_end( T BOOST_RANGE_ARRAY_REF()[sz], char_or_wchar_t_array_tag ) { - return array + sz - 1; + return boost_range_array + sz - 1; } template< class T, std::size_t sz > inline const T* array_end( const T BOOST_RANGE_ARRAY_REF()[sz], char_or_wchar_t_array_tag ) { - return array + sz - 1; + return boost_range_array + sz - 1; } template< class T, std::size_t sz > @@ -88,7 +88,7 @@ namespace boost char_or_wchar_t_array_tag, int >::type tag; - return array_end( array, tag() ); + return array_end( boost_range_array, tag() ); } template< class T, std::size_t sz > @@ -98,7 +98,7 @@ namespace boost char_or_wchar_t_array_tag, int >::type tag; - return array_end( array, tag() ); + return array_end( boost_range_array, tag() ); } ///////////////////////////////////////////////////////////////////// @@ -142,7 +142,7 @@ namespace boost is_same::value || is_same::value, char_or_wchar_t_array_tag, int >::type tag; - return array_size( array, tag() ); + return array_size( boost_range_array, tag() ); } template< class T, std::size_t sz > @@ -151,7 +151,7 @@ namespace boost typedef BOOST_RANGE_DEDUCED_TYPENAME boost::mpl::if_c< is_same::value || is_same::value, char_or_wchar_t_array_tag, int >::type tag; - return array_size( array, tag() ); + return array_size( boost_range_array, tag() ); } } // namespace 'range_detail' diff --git a/include/boost/range/detail/size.hpp b/include/boost/range/detail/size.hpp index c53946e..ae3aa47 100755 --- a/include/boost/range/detail/size.hpp +++ b/include/boost/range/detail/size.hpp @@ -73,7 +73,7 @@ namespace boost template< typename T, std::size_t sz > static std::size_t fun( T BOOST_RANGE_ARRAY_REF()[sz] ) { - return boost::range_detail::array_size( array ); + return boost::range_detail::array_size( boost_range_array ); } }; @@ -83,7 +83,7 @@ namespace boost template< typename T, std::size_t sz > static std::size_t fun( T BOOST_RANGE_ARRAY_REF()[sz] ) { - return boost::range_detail::array_size( array ); + return boost::range_detail::array_size( boost_range_array ); } };