aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2010-01-15 13:34:28 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2010-01-15 13:34:28 +0100
commitd62ee0668f2029452f164c0fddac263bd4cce8b4 (patch)
tree112a89253f415c90cda397bec4d8369a42c15a55 /Eigen/src
parent76a355817bd243944a4578a79dee5f220598172a (diff)
remove useless using comp. assignment operators
Diffstat (limited to 'Eigen/src')
-rw-r--r--Eigen/src/Array/Array.h7
-rw-r--r--Eigen/src/Core/DenseStorageBase.h9
-rw-r--r--Eigen/src/Core/Matrix.h15
-rw-r--r--Eigen/src/Core/VectorBlock.h4
4 files changed, 8 insertions, 27 deletions
diff --git a/Eigen/src/Array/Array.h b/Eigen/src/Array/Array.h
index 5f4f5a373..b8328417a 100644
--- a/Eigen/src/Array/Array.h
+++ b/Eigen/src/Array/Array.h
@@ -53,14 +53,9 @@ class Array
using Base::base;
using Base::coeff;
using Base::coeffRef;
-
- using Base::operator+=;
- using Base::operator-=;
- using Base::operator*=;
- using Base::operator/=;
/**
- * The usage of
+ * The usage of
* using Base::operator=;
* fails on MSVC. Since the code below is working with GCC and MSVC, we skipped
* the usage of 'using'. This should be done only for operator=.
diff --git a/Eigen/src/Core/DenseStorageBase.h b/Eigen/src/Core/DenseStorageBase.h
index a2e9780c6..562420f86 100644
--- a/Eigen/src/Core/DenseStorageBase.h
+++ b/Eigen/src/Core/DenseStorageBase.h
@@ -274,7 +274,7 @@ class DenseStorageBase : public _Base<Derived>
* of \c *this. In case values need to be appended to the matrix they will be uninitialized.
*/
EIGEN_STRONG_INLINE void conservativeResize(int rows, int cols)
- {
+ {
ei_conservative_resize_like_impl<Derived>::run(*this, rows, cols);
}
@@ -332,11 +332,6 @@ class DenseStorageBase : public _Base<Derived>
return Base::operator=(func);
}
- using Base::operator +=;
- using Base::operator -=;
- using Base::operator *=;
- using Base::operator /=;
-
EIGEN_STRONG_INLINE explicit DenseStorageBase() : m_storage()
{
// _check_template_params();
@@ -453,7 +448,7 @@ class DenseStorageBase : public _Base<Derived>
resizeLike(other);
}
- /**
+ /**
* \brief Copies the value of the expression \a other into \c *this with automatic resizing.
*
* *this might be resized to match the dimensions of \a other. If *this was a null matrix (not already initialized),
diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h
index cefb4eff1..fa8859f3c 100644
--- a/Eigen/src/Core/Matrix.h
+++ b/Eigen/src/Core/Matrix.h
@@ -129,7 +129,7 @@ class Matrix
{
public:
- /** \brief Base class typedef.
+ /** \brief Base class typedef.
* \sa DenseStorageBase
*/
typedef DenseStorageBase<Matrix<_Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols>, Eigen::MatrixBase, _Options> Base;
@@ -161,10 +161,10 @@ class Matrix
using Base::coeff;
using Base::coeffRef;
- /**
+ /**
* \brief Assigns matrices to each other.
*
- * \note This is a special case of the templated operator=. Its purpose is
+ * \note This is a special case of the templated operator=. Its purpose is
* to prevent a default operator= from hiding the templated operator=.
*
* \callgraph
@@ -190,7 +190,7 @@ class Matrix
}
/**
- * The usage of
+ * The usage of
* using Base::operator=;
* fails on MSVC. Since the code below is working with GCC and MSVC, we skipped
* the usage of 'using'. This should be done only for operator=.
@@ -207,11 +207,6 @@ class Matrix
return Base::operator=(func);
}
- using Base::operator +=;
- using Base::operator -=;
- using Base::operator *=;
- using Base::operator /=;
-
/** Default constructor.
*
* For fixed-size matrices, does nothing.
@@ -323,7 +318,7 @@ class Matrix
{
Base::_check_template_params();
Base::resize(other.rows(), other.cols());
- // FIXME/CHECK: isn't *this = other.derived() more efficient. it allows to
+ // FIXME/CHECK: isn't *this = other.derived() more efficient. it allows to
// go for pure _set() implementations, right?
*this = other;
}
diff --git a/Eigen/src/Core/VectorBlock.h b/Eigen/src/Core/VectorBlock.h
index 760c097ad..6dd8da938 100644
--- a/Eigen/src/Core/VectorBlock.h
+++ b/Eigen/src/Core/VectorBlock.h
@@ -78,10 +78,6 @@ template<typename VectorType, int Size> class VectorBlock
_EIGEN_GENERIC_PUBLIC_INTERFACE(VectorBlock)
using Base::operator=;
- using Base::operator+=;
- using Base::operator-=;
- using Base::operator*=;
- using Base::operator/=;
/** Dynamic-size constructor
*/