diff --git a/Eigen/src/Array/ArrayWrapper.h b/Eigen/src/Array/ArrayWrapper.h index a33d36d44..83cd8bac5 100644 --- a/Eigen/src/Array/ArrayWrapper.h +++ b/Eigen/src/Array/ArrayWrapper.h @@ -132,7 +132,7 @@ class MatrixWrapper : public MatrixBase > public: typedef MatrixBase > Base; EIGEN_DENSE_PUBLIC_INTERFACE(MatrixWrapper) - EIGEN_INHERIT_ASSIGNMENT_OPERATORS(MatrixWrapper); + EIGEN_INHERIT_ASSIGNMENT_OPERATORS(MatrixWrapper) typedef typename ei_nested::type NestedExpressionType; diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h index 1311ca38f..9dda28fef 100644 --- a/Eigen/src/Core/MathFunctions.h +++ b/Eigen/src/Core/MathFunctions.h @@ -77,7 +77,7 @@ struct ei_real_impl static inline RealScalar run(const Scalar& x) { return x; - }; + } }; template @@ -86,7 +86,7 @@ struct ei_real_impl > static inline RealScalar run(const std::complex& x) { return std::real(x); - }; + } }; template @@ -112,7 +112,7 @@ struct ei_imag_impl static inline RealScalar run(const Scalar&) { return RealScalar(0); - }; + } }; template @@ -121,7 +121,7 @@ struct ei_imag_impl > static inline RealScalar run(const std::complex& x) { return std::imag(x); - }; + } }; template @@ -147,11 +147,11 @@ struct ei_real_ref_impl static inline RealScalar& run(Scalar& x) { return reinterpret_cast(&x)[0]; - }; + } static inline const RealScalar& run(const Scalar& x) { return reinterpret_cast(&x)[0]; - }; + } }; template @@ -234,7 +234,7 @@ struct ei_conj_impl static inline Scalar run(const Scalar& x) { return x; - }; + } }; template @@ -243,7 +243,7 @@ struct ei_conj_impl > static inline std::complex run(const std::complex& x) { return std::conj(x); - }; + } }; template @@ -269,7 +269,7 @@ struct ei_abs_impl static inline RealScalar run(const Scalar& x) { return std::abs(x); - }; + } }; template @@ -295,7 +295,7 @@ struct ei_abs2_impl static inline RealScalar run(const Scalar& x) { return x*x; - }; + } }; template @@ -304,7 +304,7 @@ struct ei_abs2_impl > static inline RealScalar run(const std::complex& x) { return std::norm(x); - }; + } }; template @@ -330,7 +330,7 @@ struct ei_norm1_default_impl static inline RealScalar run(const Scalar& x) { return ei_abs(ei_real(x)) + ei_abs(ei_imag(x)); - }; + } }; template @@ -339,7 +339,7 @@ struct ei_norm1_default_impl static inline Scalar run(const Scalar& x) { return ei_abs(x); - }; + } }; template @@ -373,7 +373,7 @@ struct ei_hypot_impl RealScalar q = std::min(_x, _y); RealScalar qp = q/p; return p * ei_sqrt(RealScalar(1) + qp*qp); - }; + } }; template @@ -419,7 +419,7 @@ struct ei_sqrt_default_impl static inline Scalar run(const Scalar& x) { return std::sqrt(x); - }; + } }; template @@ -429,7 +429,7 @@ struct ei_sqrt_default_impl { EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar) return Scalar(0); - }; + } }; template @@ -457,7 +457,7 @@ struct ei_exp_default_impl static inline Scalar run(const Scalar& x) { return std::exp(x); - }; + } }; template @@ -467,7 +467,7 @@ struct ei_exp_default_impl { EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar) return Scalar(0); - }; + } }; template @@ -495,7 +495,7 @@ struct ei_cos_default_impl static inline Scalar run(const Scalar& x) { return std::cos(x); - }; + } }; template @@ -505,7 +505,7 @@ struct ei_cos_default_impl { EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar) return Scalar(0); - }; + } }; template @@ -533,7 +533,7 @@ struct ei_sin_default_impl static inline Scalar run(const Scalar& x) { return std::sin(x); - }; + } }; template @@ -543,7 +543,7 @@ struct ei_sin_default_impl { EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar) return Scalar(0); - }; + } }; template @@ -571,7 +571,7 @@ struct ei_log_default_impl static inline Scalar run(const Scalar& x) { return std::log(x); - }; + } }; template @@ -581,7 +581,7 @@ struct ei_log_default_impl { EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar) return Scalar(0); - }; + } }; template @@ -610,7 +610,7 @@ struct ei_atan2_default_impl static inline Scalar run(const Scalar& x, const Scalar& y) { return std::atan2(x, y); - }; + } }; template @@ -620,7 +620,7 @@ struct ei_atan2_default_impl { EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar) return Scalar(0); - }; + } }; template @@ -649,7 +649,7 @@ struct ei_pow_default_impl static inline Scalar run(const Scalar& x, const Scalar& y) { return std::pow(x, y); - }; + } }; template @@ -668,7 +668,7 @@ struct ei_pow_default_impl y >>= 1; } return res; - }; + } }; template @@ -713,11 +713,11 @@ struct ei_random_default_impl static inline Scalar run(const Scalar& x, const Scalar& y) { return x + (y-x) * Scalar(std::rand()) / float(RAND_MAX); - }; + } static inline Scalar run() { return run(Scalar(NumTraits::IsSigned ? -1 : 0), Scalar(1)); - }; + } }; template @@ -726,11 +726,11 @@ struct ei_random_default_impl static inline Scalar run(const Scalar& x, const Scalar& y) { return x + Scalar((y-x+1) * (std::rand() / (RAND_MAX + typename NumTraits::NonInteger(1)))); - }; + } static inline Scalar run() { return run(Scalar(NumTraits::IsSigned ? -10 : 0), Scalar(10)); - }; + } }; template @@ -740,12 +740,12 @@ struct ei_random_default_impl { return Scalar(ei_random(ei_real(x), ei_real(y)), ei_random(ei_imag(x), ei_imag(y))); - }; + } static inline Scalar run() { typedef typename NumTraits::Real RealScalar; return Scalar(ei_random(), ei_random()); - }; + } }; template @@ -855,7 +855,7 @@ template<> struct ei_random_impl static inline bool run() { return ei_random(0,1)==0 ? false : true; - }; + } }; template<> struct ei_scalar_fuzzy_impl @@ -863,7 +863,7 @@ template<> struct ei_scalar_fuzzy_impl static inline bool isApprox(bool x, bool y, bool) { return x == y; - }; + } }; #endif // EIGEN_MATHFUNCTIONS_H diff --git a/Eigen/src/plugins/ArrayCwiseUnaryOps.h b/Eigen/src/plugins/ArrayCwiseUnaryOps.h index c5c568fea..fc54005f7 100644 --- a/Eigen/src/plugins/ArrayCwiseUnaryOps.h +++ b/Eigen/src/plugins/ArrayCwiseUnaryOps.h @@ -154,9 +154,10 @@ cube() const (derived(), std::bind2nd(FUNCTOR(), s)); \ } -EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator==, std::equal_to); -EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator!=, std::not_equal_to); -EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator<, std::less); -EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator<=, std::less_equal); -EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator>, std::greater); -EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator>=, std::greater_equal); +EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator==, std::equal_to) +EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator!=, std::not_equal_to) +EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator<, std::less) +EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator<=, std::less_equal) +EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator>, std::greater) +EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator>=, std::greater_equal) +