aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/PlainObjectBase.h
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2019-01-24 10:24:45 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2019-01-24 10:24:45 +0100
commitec8a387972650cda5ad32da5f89659631ad3008a (patch)
tree9d59a2720c39e7289442aa6675dd0a445c015417 /Eigen/src/Core/PlainObjectBase.h
parent6908ce2a15887e5e5102a875a9b6f632d98c0038 (diff)
cleanup
Diffstat (limited to 'Eigen/src/Core/PlainObjectBase.h')
-rw-r--r--Eigen/src/Core/PlainObjectBase.h25
1 files changed, 7 insertions, 18 deletions
diff --git a/Eigen/src/Core/PlainObjectBase.h b/Eigen/src/Core/PlainObjectBase.h
index cd89fd365..2deaa5aab 100644
--- a/Eigen/src/Core/PlainObjectBase.h
+++ b/Eigen/src/Core/PlainObjectBase.h
@@ -526,32 +526,19 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
// EIGEN_INITIALIZE_COEFFS_IF_THAT_OPTION_IS_ENABLED
}
- #ifdef EIGEN_PARSED_BY_DOXYGEN
+ #if EIGEN_HAS_CXX11
/** \brief Construct a row of column vector with fixed size from an arbitrary number of coefficients. \cpp11
*
* \only_for_vectors
*
+ * This constructor is for 1D array or vectors with more than 4 coefficients.
+ * There exists c++98 anologue constructors for fixed-size array/vector having 1, 2, 3, or 4 coefficients.
+ *
* \warning To construct a column (resp. row) vector of fixed length, the number of values passed to this
* constructor must match the the fixed number of rows (resp. columns) of \c *this.
*/
template <typename... ArgTypes>
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
- PlainObjectBase(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args);
-
- /** \brief Constructs a Matrix or Array and initializes it by elements given by an initializer list of initializer
- * lists \cpp11
- */
- EIGEN_DEVICE_FUNC
- explicit EIGEN_STRONG_INLINE PlainObjectBase(const std::initializer_list<std::initializer_list<Scalar>>& list);
- #else // EIGEN_PARSED_BY_DOXYGEN
- #if EIGEN_HAS_CXX11
-
- protected:
- enum { IsFixedSizeVectorAtCompileTime = RowsAtCompileTime != Dynamic && ColsAtCompileTime != Dynamic && IsVectorAtCompileTime == 1 };
- public:
-
- template <typename... ArgTypes>
- EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
PlainObjectBase(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args)
: m_storage()
{
@@ -566,6 +553,9 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
static_cast<void>(x);
}
+ /** \brief Constructs a Matrix or Array and initializes it by elements given by an initializer list of initializer
+ * lists \cpp11
+ */
EIGEN_DEVICE_FUNC
explicit EIGEN_STRONG_INLINE PlainObjectBase(const std::initializer_list<std::initializer_list<Scalar>>& list)
: m_storage()
@@ -600,7 +590,6 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
}
}
#endif // end EIGEN_HAS_CXX11
- #endif // end EIGEN_PARSED_BY_DOXYGEN
/** \sa PlainObjectBase::operator=(const EigenBase<OtherDerived>&) */
template<typename OtherDerived>