diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-10-25 10:15:22 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-10-25 10:15:22 -0400 |
| commit | 4716040703be1ee906439385d20475dcddad5ce3 (patch) | |
| tree | 8efd3cf3007d8360e66f38e2d280127cbb70daa6 /Eigen/src/Core/Swap.h | |
| parent | ca85a1f6c5fc33ac382aa2d7ba2da63d55d3223e (diff) | |
bug #86 : use internal:: namespace instead of ei_ prefix
Diffstat (limited to 'Eigen/src/Core/Swap.h')
| -rw-r--r-- | Eigen/src/Core/Swap.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Eigen/src/Core/Swap.h b/Eigen/src/Core/Swap.h index 086d7f32c..abbef4443 100644 --- a/Eigen/src/Core/Swap.h +++ b/Eigen/src/Core/Swap.h @@ -32,17 +32,19 @@ * * \brief Internal helper class for swapping two expressions */ +namespace internal { template<typename ExpressionType> -struct ei_traits<SwapWrapper<ExpressionType> > : ei_traits<ExpressionType> {}; +struct traits<SwapWrapper<ExpressionType> > : traits<ExpressionType> {}; +} template<typename ExpressionType> class SwapWrapper - : public ei_dense_xpr_base<SwapWrapper<ExpressionType> >::type + : public internal::dense_xpr_base<SwapWrapper<ExpressionType> >::type { public: - typedef typename ei_dense_xpr_base<SwapWrapper>::type Base; + typedef typename internal::dense_xpr_base<SwapWrapper>::type Base; EIGEN_DENSE_PUBLIC_INTERFACE(SwapWrapper) - typedef typename ei_packet_traits<Scalar>::type Packet; + typedef typename internal::packet_traits<Scalar>::type Packet; inline SwapWrapper(ExpressionType& xpr) : m_expression(xpr) {} @@ -65,7 +67,7 @@ template<typename ExpressionType> class SwapWrapper void copyCoeff(Index row, Index col, const DenseBase<OtherDerived>& other) { OtherDerived& _other = other.const_cast_derived(); - ei_internal_assert(row >= 0 && row < rows() + eigen_internal_assert(row >= 0 && row < rows() && col >= 0 && col < cols()); Scalar tmp = m_expression.coeff(row, col); m_expression.coeffRef(row, col) = _other.coeff(row, col); @@ -76,7 +78,7 @@ template<typename ExpressionType> class SwapWrapper void copyCoeff(Index index, const DenseBase<OtherDerived>& other) { OtherDerived& _other = other.const_cast_derived(); - ei_internal_assert(index >= 0 && index < m_expression.size()); + eigen_internal_assert(index >= 0 && index < m_expression.size()); Scalar tmp = m_expression.coeff(index); m_expression.coeffRef(index) = _other.coeff(index); _other.coeffRef(index) = tmp; @@ -86,7 +88,7 @@ template<typename ExpressionType> class SwapWrapper void copyPacket(Index row, Index col, const DenseBase<OtherDerived>& other) { OtherDerived& _other = other.const_cast_derived(); - ei_internal_assert(row >= 0 && row < rows() + eigen_internal_assert(row >= 0 && row < rows() && col >= 0 && col < cols()); Packet tmp = m_expression.template packet<StoreMode>(row, col); m_expression.template writePacket<StoreMode>(row, col, @@ -99,7 +101,7 @@ template<typename ExpressionType> class SwapWrapper void copyPacket(Index index, const DenseBase<OtherDerived>& other) { OtherDerived& _other = other.const_cast_derived(); - ei_internal_assert(index >= 0 && index < m_expression.size()); + eigen_internal_assert(index >= 0 && index < m_expression.size()); Packet tmp = m_expression.template packet<StoreMode>(index); m_expression.template writePacket<StoreMode>(index, _other.template packet<LoadMode>(index) |