Index: storage.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/numeric/ublas/storage.hpp,v retrieving revision 1.70 diff -u -b -r1.70 storage.hpp --- storage.hpp 6 Nov 2005 14:57:14 -0000 1.70 +++ storage.hpp 12 Nov 2005 05:32:38 -0000 @@ -54,14 +54,11 @@ // Construction and destruction explicit BOOST_UBLAS_INLINE unbounded_array (const ALLOC &a = ALLOC()): - alloc_ (a), size_ (0) { -#ifndef NDEBUG - data_ = 0; // simplify debugging by giving data_ a definate value -#endif + alloc_ (a), size_ (0), data_ (0) { } explicit BOOST_UBLAS_INLINE unbounded_array (size_type size, const ALLOC &a = ALLOC()): - alloc_(a), size_ (size) { + alloc_(a), size_ (size), data_ (0) { if (size_) { data_ = alloc_.allocate (size_); // ISSUE some compilers may zero POD here @@ -73,36 +70,24 @@ new (d) value_type; #endif } -#ifndef NDEBUG - else - data_ = 0; // simplify debugging by giving data_ a definate value -#endif } // No value initialised, but still be default constructed BOOST_UBLAS_INLINE unbounded_array (size_type size, const value_type &init, const ALLOC &a = ALLOC()): - alloc_ (a), size_ (size) { + alloc_ (a), size_ (size), data_ (0) { if (size_) { data_ = alloc_.allocate (size_); std::uninitialized_fill (begin(), end(), init); } -#ifndef NDEBUG - else - data_ = 0; // simplify debugging by giving data_ a definate value -#endif } BOOST_UBLAS_INLINE unbounded_array (const unbounded_array &c): storage_array (), - alloc_ (c.alloc_), size_ (c.size_) { + alloc_ (c.alloc_), size_ (c.size_), data_ (0) { if (size_) { data_ = alloc_.allocate (size_); std::uninitialized_copy (c.begin(), c.end(), begin()); } -#ifndef NDEBUG - else - data_ = 0; // simplify debugging by giving data_ a definate value -#endif } BOOST_UBLAS_INLINE ~unbounded_array () { @@ -162,7 +147,7 @@ #ifndef NDEBUG if (!size) - data_ = 0; // simplify debugging by giving data_ a definate value + data_ = 0; // simplify debugging by giving data_ a definite value #endif size_ = size; }