Rename parameter to avoid Visual C++ warning about clash with boost::array.

Merged revisions 50514 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r50514 | danieljames | 2009-01-08 13:37:33 +0000 (Thu, 08 Jan 2009) | 3 lines
  
  Rename parameter to avoid Visual C++ warning about clash with boost::array.
  
  Fixes #2643
........


[SVN r50528]
This commit is contained in:
Daniel James
2009-01-09 23:12:14 +00:00
parent 6a0f115b33
commit c2fc561d41

View File

@@ -58,10 +58,10 @@ namespace boost
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
template< class T, unsigned N >
std::size_t hash_value(const T (&array)[N]);
std::size_t hash_value(const T (&x)[N]);
template< class T, unsigned N >
std::size_t hash_value(T (&array)[N]);
std::size_t hash_value(T (&x)[N]);
#endif
std::size_t hash_value(float v);
@@ -281,15 +281,15 @@ namespace boost
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
template< class T, unsigned N >
inline std::size_t hash_value(const T (&array)[N])
inline std::size_t hash_value(const T (&x)[N])
{
return hash_range(array, array + N);
return hash_range(x, x + N);
}
template< class T, unsigned N >
inline std::size_t hash_value(T (&array)[N])
inline std::size_t hash_value(T (&x)[N])
{
return hash_range(array, array + N);
return hash_range(x, x + N);
}
#endif