[pkg-boost-commits] r13881 - in boost/trunk: boost/numeric/ublas
debian debian/patches
Christophe Prudhomme
prudhomm at costa.debian.org
Mon Oct 31 06:46:19 UTC 2005
Author: prudhomm
Date: 2005-10-31 06:46:15 +0000 (Mon, 31 Oct 2005)
New Revision: 13881
Added:
boost/trunk/debian/patches/04-ublas_warnings.patch
Modified:
boost/trunk/boost/numeric/ublas/functional.hpp
boost/trunk/boost/numeric/ublas/matrix.hpp
boost/trunk/boost/numeric/ublas/matrix_sparse.hpp
boost/trunk/boost/numeric/ublas/vector.hpp
boost/trunk/debian/changelog
Log:
applied patch to remove warnings generated by -Wall
Modified: boost/trunk/boost/numeric/ublas/functional.hpp
===================================================================
--- boost/trunk/boost/numeric/ublas/functional.hpp 2005-10-30 22:44:57 UTC (rev 13880)
+++ boost/trunk/boost/numeric/ublas/functional.hpp 2005-10-31 06:46:15 UTC (rev 13881)
@@ -35,6 +35,7 @@
#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
#include <boost/numeric/bindings/atlas/cblas.hpp>
#endif
+#include <boost/concept_check.hpp>
@@ -1390,6 +1391,7 @@
size_type element (size_type i, size_type size1, size_type j, size_type size2) {
BOOST_UBLAS_CHECK (i < size1, bad_index ());
BOOST_UBLAS_CHECK (j < size2, bad_index ());
+ ignore_unused_variable_warning(size1);
// Guard against size_type overflow
BOOST_UBLAS_CHECK (i <= ((std::numeric_limits<size_type>::max) () - j) / size2, bad_index ());
return i * size2 + j;
@@ -1399,6 +1401,7 @@
size_type address (size_type i, size_type size1, size_type j, size_type size2) {
BOOST_UBLAS_CHECK (i <= size1, bad_index ());
BOOST_UBLAS_CHECK (j <= size2, bad_index ());
+ ignore_unused_variable_warning(size1);
// Guard against size_type overflow - address may be size2 past end of storage
BOOST_UBLAS_CHECK (size2 == 0 || i <= ((std::numeric_limits<size_type>::max) () - j) / size2, bad_index ());
return i * size2 + j;
@@ -1479,24 +1482,28 @@
BOOST_UBLAS_INLINE
size_type element1 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
BOOST_UBLAS_CHECK (i < size1, bad_index ());
+ ignore_unused_variable_warning(size1);
return i;
}
static
BOOST_UBLAS_INLINE
size_type element2 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
BOOST_UBLAS_CHECK (j < size2, bad_index ());
+ ignore_unused_variable_warning(size2);
return j;
}
static
BOOST_UBLAS_INLINE
size_type address1 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
BOOST_UBLAS_CHECK (i <= size1, bad_index ());
+ ignore_unused_variable_warning(size1);
return i;
}
static
BOOST_UBLAS_INLINE
size_type address2 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
BOOST_UBLAS_CHECK (j <= size2, bad_index ());
+ ignore_unused_variable_warning(size2);
return j;
}
static
@@ -1569,6 +1576,7 @@
size_type element (size_type i, size_type size1, size_type j, size_type size2) {
BOOST_UBLAS_CHECK (i < size1, bad_index ());
BOOST_UBLAS_CHECK (j < size2, bad_index ());
+ ignore_unused_variable_warning(size2);
// Guard against size_type overflow
BOOST_UBLAS_CHECK (j <= ((std::numeric_limits<size_type>::max) () - i) / size1, bad_index ());
return i + j * size1;
@@ -1578,6 +1586,7 @@
size_type address (size_type i, size_type size1, size_type j, size_type size2) {
BOOST_UBLAS_CHECK (i <= size1, bad_index ());
BOOST_UBLAS_CHECK (j <= size2, bad_index ());
+ ignore_unused_variable_warning(size2);
// Guard against size_type overflow - address may be size1 past end of storage
BOOST_UBLAS_CHECK (size1 == 0 || j <= ((std::numeric_limits<size_type>::max) () - i) / size1, bad_index ());
return i + j * size1;
@@ -1658,24 +1667,28 @@
BOOST_UBLAS_INLINE
size_type element1 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
BOOST_UBLAS_CHECK (j < size2, bad_index ());
+ ignore_unused_variable_warning(size2);
return j;
}
static
BOOST_UBLAS_INLINE
size_type element2 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
BOOST_UBLAS_CHECK (i < size1, bad_index ());
+ ignore_unused_variable_warning(size1);
return i;
}
static
BOOST_UBLAS_INLINE
size_type address1 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
BOOST_UBLAS_CHECK (j <= size2, bad_index ());
+ ignore_unused_variable_warning(size2);
return j;
}
static
BOOST_UBLAS_INLINE
size_type address2 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
BOOST_UBLAS_CHECK (i <= size1, bad_index ());
+ ignore_unused_variable_warning(size1);
return i;
}
static
Modified: boost/trunk/boost/numeric/ublas/matrix.hpp
===================================================================
--- boost/trunk/boost/numeric/ublas/matrix.hpp 2005-10-30 22:44:57 UTC (rev 13880)
+++ boost/trunk/boost/numeric/ublas/matrix.hpp 2005-10-31 06:46:15 UTC (rev 13881)
@@ -17,6 +17,8 @@
#ifndef _BOOST_UBLAS_MATRIX_
#define _BOOST_UBLAS_MATRIX_
+#include <boost/concept_check.hpp>
+
#include <boost/numeric/ublas/vector.hpp>
#include <boost/numeric/ublas/matrix_expression.hpp>
#include <boost/numeric/ublas/detail/matrix_assign.hpp>
@@ -1048,7 +1050,7 @@
return size1_;
}
BOOST_UBLAS_INLINE
- size_type size2 () const {
+ size_type size2 () const {
return size2_;
}
@@ -1082,27 +1084,27 @@
// Element access
BOOST_UBLAS_INLINE
const_reference operator () (size_type i, size_type j) const {
- return data () [layout_type::element1 (i, size1_, j, size2_)] [layout_type::element2 (i, size1_, j, size2_)];
+ return data () [layout_type::element1 (i, size1_, j, size2_)] [layout_type::element2 (i, size1_, j, size2_)];
}
BOOST_UBLAS_INLINE
reference at_element (size_type i, size_type j) {
- return data () [layout_type::element1 (i, size1_, j, size2_)] [layout_type::element2 (i, size1_, j, size2_)];
+ return data () [layout_type::element1 (i, size1_, j, size2_)] [layout_type::element2 (i, size1_, j, size2_)];
}
BOOST_UBLAS_INLINE
reference operator () (size_type i, size_type j) {
- return at_element (i, j);
+ return at_element (i, j);
}
// Element assignment
BOOST_UBLAS_INLINE
reference insert_element (size_type i, size_type j, const_reference t) {
- return (at_element (i, j) = t);
+ return (at_element (i, j) = t);
}
BOOST_UBLAS_INLINE
void erase_element (size_type i, size_type j) {
- return (at_element (i, j) = value_type/*zero*/());
+ return (at_element (i, j) = value_type/*zero*/());
}
-
+
// Zeroing
BOOST_UBLAS_INLINE
void clear () {
@@ -1119,13 +1121,13 @@
return *this;
}
BOOST_UBLAS_INLINE
- vector_of_vector &assign_temporary (vector_of_vector &m) {
+ vector_of_vector &assign_temporary (vector_of_vector &m) {
swap (m);
return *this;
}
template<class AE>
BOOST_UBLAS_INLINE
- vector_of_vector &operator = (const matrix_expression<AE> &ae) {
+ vector_of_vector &operator = (const matrix_expression<AE> &ae) {
self_type temporary (ae);
return assign_temporary (temporary);
}
@@ -1138,8 +1140,8 @@
}
template<class AE>
BOOST_UBLAS_INLINE
- vector_of_vector &assign (const matrix_expression<AE> &ae) {
- matrix_assign<scalar_assign> (*this, ae);
+ vector_of_vector &assign (const matrix_expression<AE> &ae) {
+ matrix_assign<scalar_assign> (*this, ae);
return *this;
}
template<class AE>
@@ -1156,8 +1158,8 @@
}
template<class AE>
BOOST_UBLAS_INLINE
- vector_of_vector &plus_assign (const matrix_expression<AE> &ae) {
- matrix_assign<scalar_plus_assign> (*this, ae);
+ vector_of_vector &plus_assign (const matrix_expression<AE> &ae) {
+ matrix_assign<scalar_plus_assign> (*this, ae);
return *this;
}
template<class AE>
@@ -1175,7 +1177,7 @@
template<class AE>
BOOST_UBLAS_INLINE
vector_of_vector &minus_assign (const matrix_expression<AE> &ae) {
- matrix_assign<scalar_minus_assign> (*this, ae);
+ matrix_assign<scalar_minus_assign> (*this, ae);
return *this;
}
template<class AT>
@@ -1294,7 +1296,7 @@
const self_type &m = (*this) ();
if (layout_type::fast1 ())
++ it_;
- else
+ else
it_ = m.find1 (1, i_, j_).it_;
return *this;
}
@@ -2137,6 +2139,7 @@
BOOST_UBLAS_INLINE
bool operator == (const const_iterator1 &it) const {
BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
+ boost::ignore_unused_variable_warning(it);
return true;
}
};
@@ -2246,6 +2249,7 @@
BOOST_UBLAS_INLINE
bool operator == (const const_iterator2 &it) const {
BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
+ boost::ignore_unused_variable_warning(it);
return true;
}
};
@@ -2369,7 +2373,7 @@
return *this;
}
BOOST_UBLAS_INLINE
- identity_matrix &assign_temporary (identity_matrix &m) {
+ identity_matrix &assign_temporary (identity_matrix &m) {
swap (m);
return *this;
}
@@ -2464,14 +2468,14 @@
typename self_type::
#endif
const_iterator2 begin () const {
- return const_iterator2 ((*this) (), it_);
+ return const_iterator2 ((*this) (), it_);
}
BOOST_UBLAS_INLINE
#ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
typename self_type::
#endif
const_iterator2 end () const {
- return const_iterator2 ((*this) (), it_ + 1);
+ return const_iterator2 ((*this) (), it_ + 1);
}
BOOST_UBLAS_INLINE
#ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
@@ -2576,14 +2580,14 @@
typename self_type::
#endif
const_iterator1 begin () const {
- return const_iterator1 ((*this) (), it_);
+ return const_iterator1 ((*this) (), it_);
}
BOOST_UBLAS_INLINE
#ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
typename self_type::
#endif
const_iterator1 end () const {
- return const_iterator1 ((*this) (), it_ + 1);
+ return const_iterator1 ((*this) (), it_ + 1);
}
BOOST_UBLAS_INLINE
#ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
@@ -2729,7 +2733,7 @@
// Element access
BOOST_UBLAS_INLINE
const_reference operator () (size_type /*i*/, size_type /*j*/) const {
- return value_;
+ return value_;
}
// Assignment
@@ -2741,7 +2745,7 @@
return *this;
}
BOOST_UBLAS_INLINE
- scalar_matrix &assign_temporary (scalar_matrix &m) {
+ scalar_matrix &assign_temporary (scalar_matrix &m) {
swap (m);
return *this;
}
@@ -2786,7 +2790,7 @@
BOOST_UBLAS_INLINE
const_iterator2 find2 (int /*rank*/, size_type i, size_type j) const {
return const_iterator2 (*this, i, j);
- }
+ }
#ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR
@@ -3216,7 +3220,7 @@
reference insert_element (size_type i, size_type j, const_reference t) {
return (at_element (i, j) = t);
}
-
+
// Zeroing
BOOST_UBLAS_INLINE
void clear () {
@@ -3247,14 +3251,14 @@
}
template<class AE>
BOOST_UBLAS_INLINE
- c_matrix &operator = (const matrix_expression<AE> &ae) {
+ c_matrix &operator = (const matrix_expression<AE> &ae) {
self_type temporary (ae);
return assign_temporary (temporary);
}
template<class AE>
BOOST_UBLAS_INLINE
- c_matrix &assign (const matrix_expression<AE> &ae) {
- matrix_assign<scalar_assign> (*this, ae);
+ c_matrix &assign (const matrix_expression<AE> &ae) {
+ matrix_assign<scalar_assign> (*this, ae);
return *this;
}
template<class AE>
@@ -3271,8 +3275,8 @@
}
template<class AE>
BOOST_UBLAS_INLINE
- c_matrix &plus_assign (const matrix_expression<AE> &ae) {
- matrix_assign<scalar_plus_assign> (*this, ae);
+ c_matrix &plus_assign (const matrix_expression<AE> &ae) {
+ matrix_assign<scalar_plus_assign> (*this, ae);
return *this;
}
template<class AE>
@@ -3289,8 +3293,8 @@
}
template<class AE>
BOOST_UBLAS_INLINE
- c_matrix &minus_assign (const matrix_expression<AE> &ae) {
- matrix_assign<scalar_minus_assign> (*this, ae);
+ c_matrix &minus_assign (const matrix_expression<AE> &ae) {
+ matrix_assign<scalar_minus_assign> (*this, ae);
return *this;
}
template<class AT>
Modified: boost/trunk/boost/numeric/ublas/matrix_sparse.hpp
===================================================================
--- boost/trunk/boost/numeric/ublas/matrix_sparse.hpp 2005-10-30 22:44:57 UTC (rev 13880)
+++ boost/trunk/boost/numeric/ublas/matrix_sparse.hpp 2005-10-31 06:46:15 UTC (rev 13881)
@@ -17,6 +17,8 @@
#ifndef _BOOST_UBLAS_MATRIX_SPARSE_
#define _BOOST_UBLAS_MATRIX_SPARSE_
+#include <boost/concept_check.hpp>
+
#include <boost/numeric/ublas/vector_sparse.hpp>
#include <boost/numeric/ublas/matrix_expression.hpp>
#include <boost/numeric/ublas/detail/matrix_assign.hpp>
@@ -2677,6 +2679,7 @@
void resize (size_type size1, size_type size2, bool preserve = true) {
// FIXME preserve unimplemented
BOOST_UBLAS_CHECK (!preserve, internal_logic ());
+ boost::ignore_unused_variable_warning(preserve);
size1_ = size1;
size2_ = size2;
capacity_ = restrict_capacity (capacity_);
Modified: boost/trunk/boost/numeric/ublas/vector.hpp
===================================================================
--- boost/trunk/boost/numeric/ublas/vector.hpp 2005-10-30 22:44:57 UTC (rev 13880)
+++ boost/trunk/boost/numeric/ublas/vector.hpp 2005-10-31 06:46:15 UTC (rev 13881)
@@ -20,6 +20,7 @@
#include <boost/numeric/ublas/storage.hpp>
#include <boost/numeric/ublas/vector_expression.hpp>
#include <boost/numeric/ublas/detail/vector_assign.hpp>
+#include <boost/concept_check.hpp>
// Iterators based on ideas of Jeremy Siek
@@ -137,7 +138,7 @@
void erase_element (size_type i) {
data () [i] = value_type/*zero*/();
}
-
+
// Zeroing
BOOST_UBLAS_INLINE
void clear () {
@@ -702,6 +703,7 @@
BOOST_UBLAS_INLINE
bool operator == (const const_iterator &it) const {
BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
+ ignore_unused_variable_warning(it);
return true;
}
};
@@ -1287,7 +1289,7 @@
BOOST_UBLAS_CHECK (i < size_, bad_index ());
return (data_ [i] = value_type/*zero*/());
}
-
+
// Zeroing
BOOST_UBLAS_INLINE
void clear () {
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2005-10-30 22:44:57 UTC (rev 13880)
+++ boost/trunk/debian/changelog 2005-10-31 06:46:15 UTC (rev 13881)
@@ -5,6 +5,8 @@
* Applied patch from 1.33.1 to unbreak is_incrementable with g++-4.02
* Bug fix: "boost: Please consider providing single-threaded Boost
libraries as well", thanks to Waba (Closes: #335594).
+ * Applied patch to remove warnings when compiling ublas with -Wall,
+ patch sent upstream
--
Added: boost/trunk/debian/patches/04-ublas_warnings.patch
===================================================================
--- boost/trunk/debian/patches/04-ublas_warnings.patch 2005-10-30 22:44:57 UTC (rev 13880)
+++ boost/trunk/debian/patches/04-ublas_warnings.patch 2005-10-31 06:46:15 UTC (rev 13881)
@@ -0,0 +1,165 @@
+Only in ./detail: semantic.cache
+diff -x CVS -u -r /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/functional.hpp ./functional.hpp
+--- /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/functional.hpp 2005-07-14 15:05:27.000000000 +0200
++++ ./functional.hpp 2005-10-28 10:03:19.136784304 +0200
+@@ -35,6 +35,7 @@
+ #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+ #include <boost/numeric/bindings/atlas/cblas.hpp>
+ #endif
++#include <boost/concept_check.hpp>
+
+
+
+@@ -1390,6 +1391,7 @@
+ size_type element (size_type i, size_type size1, size_type j, size_type size2) {
+ BOOST_UBLAS_CHECK (i < size1, bad_index ());
+ BOOST_UBLAS_CHECK (j < size2, bad_index ());
++ ignore_unused_variable_warning(size1);
+ // Guard against size_type overflow
+ BOOST_UBLAS_CHECK (i <= ((std::numeric_limits<size_type>::max) () - j) / size2, bad_index ());
+ return i * size2 + j;
+@@ -1399,6 +1401,7 @@
+ size_type address (size_type i, size_type size1, size_type j, size_type size2) {
+ BOOST_UBLAS_CHECK (i <= size1, bad_index ());
+ BOOST_UBLAS_CHECK (j <= size2, bad_index ());
++ ignore_unused_variable_warning(size1);
+ // Guard against size_type overflow - address may be size2 past end of storage
+ BOOST_UBLAS_CHECK (size2 == 0 || i <= ((std::numeric_limits<size_type>::max) () - j) / size2, bad_index ());
+ return i * size2 + j;
+@@ -1479,24 +1482,28 @@
+ BOOST_UBLAS_INLINE
+ size_type element1 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
+ BOOST_UBLAS_CHECK (i < size1, bad_index ());
++ ignore_unused_variable_warning(size1);
+ return i;
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type element2 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
+ BOOST_UBLAS_CHECK (j < size2, bad_index ());
++ ignore_unused_variable_warning(size2);
+ return j;
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type address1 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
+ BOOST_UBLAS_CHECK (i <= size1, bad_index ());
++ ignore_unused_variable_warning(size1);
+ return i;
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type address2 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
+ BOOST_UBLAS_CHECK (j <= size2, bad_index ());
++ ignore_unused_variable_warning(size2);
+ return j;
+ }
+ static
+@@ -1569,6 +1576,7 @@
+ size_type element (size_type i, size_type size1, size_type j, size_type size2) {
+ BOOST_UBLAS_CHECK (i < size1, bad_index ());
+ BOOST_UBLAS_CHECK (j < size2, bad_index ());
++ ignore_unused_variable_warning(size2);
+ // Guard against size_type overflow
+ BOOST_UBLAS_CHECK (j <= ((std::numeric_limits<size_type>::max) () - i) / size1, bad_index ());
+ return i + j * size1;
+@@ -1578,6 +1586,7 @@
+ size_type address (size_type i, size_type size1, size_type j, size_type size2) {
+ BOOST_UBLAS_CHECK (i <= size1, bad_index ());
+ BOOST_UBLAS_CHECK (j <= size2, bad_index ());
++ ignore_unused_variable_warning(size2);
+ // Guard against size_type overflow - address may be size1 past end of storage
+ BOOST_UBLAS_CHECK (size1 == 0 || j <= ((std::numeric_limits<size_type>::max) () - i) / size1, bad_index ());
+ return i + j * size1;
+@@ -1658,24 +1667,28 @@
+ BOOST_UBLAS_INLINE
+ size_type element1 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
+ BOOST_UBLAS_CHECK (j < size2, bad_index ());
++ ignore_unused_variable_warning(size2);
+ return j;
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type element2 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
+ BOOST_UBLAS_CHECK (i < size1, bad_index ());
++ ignore_unused_variable_warning(size1);
+ return i;
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type address1 (size_type /* i */, size_type /* size1 */, size_type j, size_type size2) {
+ BOOST_UBLAS_CHECK (j <= size2, bad_index ());
++ ignore_unused_variable_warning(size2);
+ return j;
+ }
+ static
+ BOOST_UBLAS_INLINE
+ size_type address2 (size_type i, size_type size1, size_type /* j */, size_type /* size2 */) {
+ BOOST_UBLAS_CHECK (i <= size1, bad_index ());
++ ignore_unused_variable_warning(size1);
+ return i;
+ }
+ static
+Only in .: matrix_expression.hpp~
+diff -x CVS -u -r /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/matrix.hpp ./matrix.hpp
+--- /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/matrix.hpp 2005-08-25 11:13:05.000000000 +0200
++++ ./matrix.hpp 2005-10-28 10:04:41.782220288 +0200
+@@ -2137,6 +2137,7 @@
+ BOOST_UBLAS_INLINE
+ bool operator == (const const_iterator1 &it) const {
+ BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
++ boost::ignore_unused_variable_warning(it);
+ return true;
+ }
+ };
+@@ -2246,6 +2247,7 @@
+ BOOST_UBLAS_INLINE
+ bool operator == (const const_iterator2 &it) const {
+ BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
++ boost::ignore_unused_variable_warning(it);
+ return true;
+ }
+ };
+Only in .: matrix_proxy.hpp~
+diff -x CVS -u -r /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/matrix_sparse.hpp ./matrix_sparse.hpp
+--- /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/matrix_sparse.hpp 2005-10-25 20:13:14.322634920 +0200
++++ ./matrix_sparse.hpp 2005-10-28 12:21:50.941197968 +0200
+@@ -17,6 +17,8 @@
+ #ifndef _BOOST_UBLAS_MATRIX_SPARSE_
+ #define _BOOST_UBLAS_MATRIX_SPARSE_
+
++#include <boost/concept_check.hpp>
++
+ #include <boost/numeric/ublas/vector_sparse.hpp>
+ #include <boost/numeric/ublas/matrix_expression.hpp>
+ #include <boost/numeric/ublas/detail/matrix_assign.hpp>
+@@ -2677,6 +2679,7 @@
+ void resize (size_type size1, size_type size2, bool preserve = true) {
+ // FIXME preserve unimplemented
+ BOOST_UBLAS_CHECK (!preserve, internal_logic ());
++ boost::ignore_unused_variable_warning(preserve);
+ size1_ = size1;
+ size2_ = size2;
+ capacity_ = restrict_capacity (capacity_);
+Only in .: matrix_sparse.hpp~
+Only in .: semantic.cache
+Only in .: semantic.cache~
+diff -x CVS -u -r /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/vector.hpp ./vector.hpp
+--- /home/prudhomm/Devel/C++/Boost/boost-1.33/boost/numeric/ublas/vector.hpp 2005-08-25 11:13:05.000000000 +0200
++++ ./vector.hpp 2005-10-28 09:41:56.349797568 +0200
+@@ -20,6 +20,7 @@
+ #include <boost/numeric/ublas/storage.hpp>
+ #include <boost/numeric/ublas/vector_expression.hpp>
+ #include <boost/numeric/ublas/detail/vector_assign.hpp>
++#include <boost/concept_check.hpp>
+
+ // Iterators based on ideas of Jeremy Siek
+
+@@ -702,6 +703,7 @@
+ BOOST_UBLAS_INLINE
+ bool operator == (const const_iterator &it) const {
+ BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ());
++ ignore_unused_variable_warning(it);
+ return true;
+ }
+ };
More information about the pkg-boost-commits
mailing list