From eea368fadfad543c8b308c86faf17ec3729dbca4 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 29 Mar 2011 14:47:50 +0000 Subject: [PATCH] Merge changes in Boost.Array to release [SVN r70697] --- test/array2.cpp | 3 +-- test/array6.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/test/array2.cpp b/test/array2.cpp index 1c8ccf8..b33e0b5 100644 --- a/test/array2.cpp +++ b/test/array2.cpp @@ -15,12 +15,11 @@ #include #include "print.hpp" using namespace std; -using namespace boost; int main() { // create and initialize array - array a = { { 1, 2, 3, 4, 5 } }; + boost::array a = { { 1, 2, 3, 4, 5 } }; print_elements(a); diff --git a/test/array6.cpp b/test/array6.cpp index 388b39f..658cec6 100644 --- a/test/array6.cpp +++ b/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)" ); } }