[Boost-commit] svn:boost r70697 - branches/release/libs/array/test

Subject: [Boost-commit] svn:boost r70697 - branches/release/libs/array/test
From: marshall_at_[hidden]
Date: 2011-03-29 10:47:51

Author: marshall
Date: 2011-03-29 10:47:50 EDT (Tue, 29 Mar 2011)
New Revision: 70697
URL: http://svn.boost.org/trac/boost/changeset/70697

Log:
Merge changes in Boost.Array to release
Properties modified: 
   branches/release/libs/array/test/array2.cpp   (contents, props changed)
   branches/release/libs/array/test/array6.cpp   (contents, props changed)
Text files modified: 
   branches/release/libs/array/test/array2.cpp |     3 +--                                     
   branches/release/libs/array/test/array6.cpp |    14 +++++++-------                          
   2 files changed, 8 insertions(+), 9 deletions(-)

Modified: branches/release/libs/array/test/array2.cpp
==============================================================================
--- branches/release/libs/array/test/array2.cpp	(original)
+++ branches/release/libs/array/test/array2.cpp	2011-03-29 10:47:50 EDT (Tue, 29 Mar 2011)
@@ -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);
 

Modified: branches/release/libs/array/test/array6.cpp
==============================================================================
--- branches/release/libs/array/test/array6.cpp	(original)
+++ branches/release/libs/array/test/array6.cpp	2011-03-29 10:47:50 EDT (Tue, 29 Mar 2011)
@@ -26,13 +26,13 @@
     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)" );
 }
 
 }