Release 1.50.0 beta 1

[SVN r78831]

include/boost/array.hpp

@@ -13,6 +13,7 @@
  * accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
  *
+ * 14 Apr 2012 - (mtc) Added support for boost::hash
  * 28 Dec 2010 - (mtc) Added cbegin and cend (and crbegin and crend) for C++Ox compatibility.
  * 10 Mar 2010 - (mtc) fill method added, matching resolution of the standard library working group.
  *      See <http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-defects.html#776> or Trac issue #3168
@@ -46,6 +47,7 @@
 // Handles broken standard libraries better than <iterator>
 #include <boost/detail/iterator.hpp>
 #include <boost/throw_exception.hpp>
+#include <boost/functional/hash_fwd.hpp>
 #include <algorithm>
 
 // FIXES for broken compilers
@@ -118,13 +120,13 @@ namespace boost {
         // operator[]
         reference operator[](size_type i) 
         { 
-            BOOST_ASSERT( i < N && "out of range" ); 
+            BOOST_ASSERT_MSG( i < N, "out of range" );
             return elems[i];
         }
         
         const_reference operator[](size_type i) const 
         {     
-            BOOST_ASSERT( i < N && "out of range" ); 
+            BOOST_ASSERT_MSG( i < N, "out of range" );
             return elems[i]; 
         }
 
@@ -322,7 +324,7 @@ namespace boost {
         static reference failed_rangecheck () {
                 std::out_of_range e("attempt to access element of an empty array");
                 boost::throw_exception(e);
-#if defined(BOOST_NO_EXCEPTIONS) || !defined(BOOST_MSVC)
+#if defined(BOOST_NO_EXCEPTIONS) || (!defined(BOOST_MSVC) && !defined(__PATHSCALE__))
                 //
                 // We need to return something here to keep
                 // some compilers happy: however we will never
@@ -427,6 +429,13 @@ namespace boost {
     }
 #endif
 
+
+    template<class T, std::size_t N>
+    std::size_t hash_value(const array<T,N>& arr)
+    {
+        return boost::hash_range(arr.begin(), arr.end());
+    }
+
 } /* namespace boost */
 
 

test/Jamfile.v2

@@ -12,4 +12,5 @@ test-suite array :
     [ run array4.cpp ]
     [ run array5.cpp ]
     [ run array6.cpp ]
+    [ run array_hash.cpp ]
     ;

test/array2.cpp

@@ -15,12 +15,11 @@
 #include <boost/array.hpp>
 #include "print.hpp"
 using namespace std;
-using namespace boost;
 
 int main()
 {
     // create and initialize array
-    array<int,10> a = { { 1, 2, 3, 4, 5 } };
+    boost::array<int,10> a = { { 1, 2, 3, 4, 5 } };
 
     print_elements(a);
 

test/array6.cpp

@@ -26,13 +26,13 @@ void    RunTests()
     test_type           test_case; //   =   { 1, 1, 2, 3, 5 };
     
     arr &aRef = get_c_array ( test_case );
-	if ( &*test_case.begin () != &aRef[0] )
-		fail_test ( "Array6: Same thing not equal?(1)" );
-		
-	const arr &caRef = get_c_array ( test_case );
-	typename test_type::const_iterator iter = test_case.begin ();
-	if ( &*iter != &caRef[0] )
-		fail_test ( "Array6: Same thing not equal?(2)" );
+    if ( &*test_case.begin () != &aRef[0] )
+        fail_test ( "Array6: Same thing not equal?(1)" );
+        
+    const arr &caRef = get_c_array ( test_case );
+    typename test_type::const_iterator iter = test_case.begin ();
+    if ( &*iter != &caRef[0] )
+        fail_test ( "Array6: Same thing not equal?(2)" );
 }
 
 }

test/array_hash.cpp

@@ -0,0 +1,49 @@
+/* tests for using boost::hash with boost::array
+ * (C) Copyright Marshall Clow 2012
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+#include <string>
+#include <iostream>
+#include <boost/array.hpp>
+#include <algorithm>
+#include <boost/functional/hash.hpp>
+
+namespace {
+unsigned int failed_tests = 0;
+
+void    fail_test( const char * reason ) {
+    ++failed_tests;
+    std::cerr << "Test failure " << failed_tests << ": " << reason << std::endl;
+}
+
+template< class T >
+void    RunTests()
+{
+//    std::size_t hash0 = boost::hash<boost::array<T,0> > () ( boost::array<T, 0> ());
+//    std::size_t hash1 = boost::hash<boost::array<T,1> > () ( boost::array<T, 1> ());
+    
+    typedef boost::array< T, 5 >    barr;
+    typedef T arr[5];
+    barr           test_barr =   {{ 1, 1, 2, 3, 5 }};
+    arr            test_arr  =    { 1, 1, 2, 3, 5 };
+    
+    std::size_t bhash = boost::hash<barr> () ( test_barr );
+    std::size_t ahash = boost::hash<arr>  () ( test_arr );
+    if ( ahash != bhash )
+        fail_test ( "Array_hash: Hash-mismatch on " );
+}
+
+}
+
+int main()
+{
+    RunTests< int >();
+    RunTests< long >();
+    RunTests< long double >();
+
+    return failed_tests;
+}
+