Merge changes in Boost.Array to release

[SVN r70697]
This commit is contained in:
Marshall Clow
2011-03-29 14:47:50 +00:00
parent 26edbea113
commit eea368fadf
2 changed files with 8 additions and 9 deletions

View File

@ -15,12 +15,11 @@
#include <boost/array.hpp> #include <boost/array.hpp>
#include "print.hpp" #include "print.hpp"
using namespace std; using namespace std;
using namespace boost;
int main() int main()
{ {
// create and initialize array // 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); print_elements(a);

View File

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