[Boost-commit] svn:boost r50528 - in branches/release: . boost/functional/hash

Subject: [Boost-commit] svn:boost r50528 - in branches/release: . boost/functional/hash
From: daniel_james_at_[hidden]
Date: 2009-01-09 18:12:15

Author: danieljames
Date: 2009-01-09 18:12:14 EST (Fri, 09 Jan 2009)
New Revision: 50528
URL: http://svn.boost.org/trac/boost/changeset/50528

Log:
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
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/boost/functional/hash/hash.hpp |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: branches/release/boost/functional/hash/hash.hpp
==============================================================================
--- branches/release/boost/functional/hash/hash.hpp	(original)
+++ branches/release/boost/functional/hash/hash.hpp	2009-01-09 18:12:14 EST (Fri, 09 Jan 2009)
@@ -58,10 +58,10 @@
 
 #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 @@
 
 #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