*** matrix_sparse.hpp Mon Apr 11 20:21:43 2011 --- /share/apps/jurassic-2.7-glorim2-b/include/boost/numeric/ublas/matrix_sparse.hpp Wed Mar 30 19:54:46 2011 *************** *** 2666,2672 **** storage_invariants (); } BOOST_UBLAS_INLINE ! compressed_matrix (size_type size1, size_type size2, array_size_type non_zeros = 0): matrix_container (), size1_ (size1), size2_ (size2), capacity_ (restrict_capacity (non_zeros)), filled1_ (1), filled2_ (0), --- 2666,2672 ---- storage_invariants (); } BOOST_UBLAS_INLINE ! compressed_matrix (size_type size1, size_type size2, size_type non_zeros = 0): matrix_container (), size1_ (size1), size2_ (size2), capacity_ (restrict_capacity (non_zeros)), filled1_ (1), filled2_ (0), *************** *** 2709,2715 **** template BOOST_UBLAS_INLINE ! compressed_matrix (const matrix_expression &ae, array_size_type non_zeros = 0): matrix_container (), size1_ (ae ().size1 ()), size2_ (ae ().size2 ()), capacity_ (restrict_capacity (non_zeros)), filled1_ (1), filled2_ (0), --- 2709,2715 ---- template BOOST_UBLAS_INLINE ! compressed_matrix (const matrix_expression &ae, size_type non_zeros = 0): matrix_container (), size1_ (ae ().size1 ()), size2_ (ae ().size2 ()), capacity_ (restrict_capacity (non_zeros)), filled1_ (1), filled2_ (0), *************** *** 2730,2740 **** return size2_; } BOOST_UBLAS_INLINE ! array_size_type nnz_capacity () const { return capacity_; } BOOST_UBLAS_INLINE ! array_size_type nnz () const { return filled2_; } --- 2730,2740 ---- return size2_; } BOOST_UBLAS_INLINE ! size_type nnz_capacity () const { return capacity_; } BOOST_UBLAS_INLINE ! size_type nnz () const { return filled2_; } *************** *** 2819,2825 **** // Reserving BOOST_UBLAS_INLINE ! void reserve (array_size_type non_zeros, bool preserve = true) { capacity_ = restrict_capacity (non_zeros); if (preserve) { index2_data_.resize (capacity_, size_type ()); --- 2819,2825 ---- // Reserving BOOST_UBLAS_INLINE ! void reserve (size_type non_zeros, bool preserve = true) { capacity_ = restrict_capacity (non_zeros); if (preserve) { index2_data_.resize (capacity_, size_type ());