From: dgregor_at_[hidden]
Date: 2007-10-22 15:54:55
Author: dgregor
Date: 2007-10-22 15:54:54 EDT (Mon, 22 Oct 2007)
New Revision: 40300
URL: http://svn.boost.org/trac/boost/changeset/40300
Log:
Suppress a GCC 4.3 warning and fix a couple header-inclusion issues.
Fixes #1338
Text files modified:
trunk/boost/numeric/interval/arith2.hpp | 3 ++-
trunk/boost/numeric/ublas/detail/vector_assign.hpp | 1 +
trunk/boost/numeric/ublas/operation_blocked.hpp | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
Modified: trunk/boost/numeric/interval/arith2.hpp
==============================================================================
--- trunk/boost/numeric/interval/arith2.hpp (original)
+++ trunk/boost/numeric/interval/arith2.hpp 2007-10-22 15:54:54 EDT (Mon, 22 Oct 2007)
@@ -275,7 +275,7 @@
if (k == 1) return x;
typename Policies::rounding rnd;
typedef typename interval_lib::unprotect<I>::type R;
- if (!interval_lib::user::is_pos(x.upper()))
+ if (!interval_lib::user::is_pos(x.upper())) {
if (interval_lib::user::is_zero(x.upper())) {
T zero(0);
if (!(k & 1) || interval_lib::user::is_zero(x.lower())) // [-1,0]^/2 or [0,0]
@@ -288,6 +288,7 @@
return I(-interval_lib::detail::root_aux_up<R>(-x.lower(), k),
-interval_lib::detail::root_aux_dn<R>(-x.upper(), k), true);
}
+ }
T u = interval_lib::detail::root_aux_up<R>(x.upper(), k);
if (!interval_lib::user::is_pos(x.lower()))
if (!(k & 1) || interval_lib::user::is_zero(x.lower())) // [-1,1]^/2 or [0,1]
Modified: trunk/boost/numeric/ublas/detail/vector_assign.hpp
==============================================================================
--- trunk/boost/numeric/ublas/detail/vector_assign.hpp (original)
+++ trunk/boost/numeric/ublas/detail/vector_assign.hpp 2007-10-22 15:54:54 EDT (Mon, 22 Oct 2007)
@@ -13,6 +13,7 @@
#ifndef _BOOST_UBLAS_VECTOR_ASSIGN_
#define _BOOST_UBLAS_VECTOR_ASSIGN_
+#include <boost/numeric/ublas/functional.hpp> // scalar_assign
// Required for make_conformant storage
#include <vector>
Modified: trunk/boost/numeric/ublas/operation_blocked.hpp
==============================================================================
--- trunk/boost/numeric/ublas/operation_blocked.hpp (original)
+++ trunk/boost/numeric/ublas/operation_blocked.hpp 2007-10-22 15:54:54 EDT (Mon, 22 Oct 2007)
@@ -14,6 +14,8 @@
#define _BOOST_UBLAS_OPERATION_BLOCKED_
#include <boost/numeric/ublas/traits.hpp>
+#include <boost/numeric/ublas/detail/vector_assign.hpp> // indexing_vector_assign
+#include <boost/numeric/ublas/detail/matrix_assign.hpp> // indexing_matrix_assign
namespace boost { namespace numeric { namespace ublas {