diff --git a/Eigen/src/Core/Functors.h b/Eigen/src/Core/Functors.h index d559deedf..5255a980c 100644 --- a/Eigen/src/Core/Functors.h +++ b/Eigen/src/Core/Functors.h @@ -494,10 +494,10 @@ template struct ei_linspaced_op_impl { typedef typename ei_packet_traits::type PacketScalar; - - ei_linspaced_op_impl(Scalar low, Scalar step) : - m_low(low), m_step(step), - m_packetStep(ei_pset1(ei_packet_traits::size*step)), + + ei_linspaced_op_impl(Scalar low, Scalar step) : + m_low(low), m_step(step), + m_packetStep(ei_pset1(ei_packet_traits::size*step)), m_base(ei_padd(ei_pset1(low),ei_pmul(ei_pset1(step),ei_plset(-ei_packet_traits::size)))) {} template @@ -514,13 +514,13 @@ struct ei_linspaced_op_impl // random access for packet ops: // 1) each step // [low, ..., low] + ( [step, ..., step] * ( [i, ..., i] + [0, ..., size] ) ) -template +template struct ei_linspaced_op_impl { typedef typename ei_packet_traits::type PacketScalar; - ei_linspaced_op_impl(Scalar low, Scalar step) : - m_low(low), m_step(step), + ei_linspaced_op_impl(Scalar low, Scalar step) : + m_low(low), m_step(step), m_lowPacket(ei_pset1(m_low)), m_stepPacket(ei_pset1(m_step)), m_interPacket(ei_plset(0)) {} template @@ -544,7 +544,7 @@ struct ei_linspaced_op_impl template struct ei_linspaced_op; template struct ei_functor_traits< ei_linspaced_op > { enum { Cost = 1, PacketAccess = ei_packet_traits::size>1, IsRepeatable = true }; }; -template struct ei_linspaced_op +template struct ei_linspaced_op { typedef typename ei_packet_traits::type PacketScalar; ei_linspaced_op(Scalar low, Scalar high, int num_steps) : impl(low, (high-low)/(num_steps-1)) {} @@ -552,7 +552,7 @@ template struct ei_linspaced_op EIGEN_STRONG_INLINE const Scalar operator() (Index i, Index = 0) const { return impl(i); } template EIGEN_STRONG_INLINE const PacketScalar packetOp(Index i, Index = 0) const { return impl.packetOp(i); } - // This proxy object handles the actual required temporaries, the different + // This proxy object handles the actual required temporaries, the different // implementations (random vs. sequential access) as well as the piping // correct piping to size 2/4 packet operations. const ei_linspaced_op_impl impl; diff --git a/Eigen/src/Core/Transpose.h b/Eigen/src/Core/Transpose.h index b1a509a3e..03973859d 100644 --- a/Eigen/src/Core/Transpose.h +++ b/Eigen/src/Core/Transpose.h @@ -310,37 +310,37 @@ struct ei_blas_traits > static inline const XprType extract(const XprType& x) { return x; } }; -template +template struct ei_check_transpose_aliasing_compile_time_selector { - enum { ret = ei_blas_traits::IsTransposed != DestIsTranposed + enum { ret = ei_blas_traits::IsTransposed != DestIsTransposed }; }; -template -struct ei_check_transpose_aliasing_compile_time_selector > +template +struct ei_check_transpose_aliasing_compile_time_selector > { - enum { ret = ei_blas_traits::IsTransposed != DestIsTranposed - || ei_blas_traits::IsTransposed != DestIsTranposed + enum { ret = ei_blas_traits::IsTransposed != DestIsTransposed + || ei_blas_traits::IsTransposed != DestIsTransposed }; }; -template +template struct ei_check_transpose_aliasing_run_time_selector { static bool run(const Scalar* dest, const OtherDerived& src) { - return (ei_blas_traits::IsTransposed != DestIsTranposed) && (dest!=0 && dest==(Scalar*)ei_extract_data(src)); + return (ei_blas_traits::IsTransposed != DestIsTransposed) && (dest!=0 && dest==(Scalar*)ei_extract_data(src)); } }; -template -struct ei_check_transpose_aliasing_run_time_selector > +template +struct ei_check_transpose_aliasing_run_time_selector > { static bool run(const Scalar* dest, const CwiseBinaryOp& src) { - return ((ei_blas_traits::IsTransposed != DestIsTranposed) && (dest!=0 && dest==(Scalar*)ei_extract_data(src.lhs()))) - || ((ei_blas_traits::IsTransposed != DestIsTranposed) && (dest!=0 && dest==(Scalar*)ei_extract_data(src.rhs()))); + return ((ei_blas_traits::IsTransposed != DestIsTransposed) && (dest!=0 && dest==(Scalar*)ei_extract_data(src.lhs()))) + || ((ei_blas_traits::IsTransposed != DestIsTransposed) && (dest!=0 && dest==(Scalar*)ei_extract_data(src.rhs()))); } };