some cleanup

This commit is contained in:
Benoit Jacob 2007-08-17 14:38:38 +00:00
parent c14ba38df3
commit c141f18b54
2 changed files with 9 additions and 23 deletions

View File

@ -59,7 +59,7 @@ namespace tvmet {
* will be written random into the memory.
*
*/
template<class Obj, int LEN>
template<typename Obj, int LEN>
class CommaInitializer
{
typedef typename Obj::value_type value_type;
@ -109,25 +109,18 @@ public:
means the first value is assigned by %operator=() and the 2nd value after the
comma. Therefore we call the %Initializer::operator,() for the list starting
after the 2nd. */
Initializer<2> operator,(value_type rhs);
Initializer<2> operator,(value_type rhs)
{
m_object.commaWrite(0, m_data);
m_object.commaWrite(1, rhs);
return Initializer<2>(m_object, 2);
}
private:
Obj& m_object;
value_type m_data;
Obj& m_object;
value_type m_data;
};
/*
* Implementation
*/
template<class Obj, int LEN>
typename CommaInitializer<Obj, LEN>::template Initializer<2>
CommaInitializer<Obj, LEN>::operator,(typename Obj::value_type rhs)
{
m_object.commaWrite(0, m_data);
m_object.commaWrite(1, rhs);
return Initializer<2>(m_object, 2);
}
} // namespace tvmet
#endif // TVMET_COMMA_INITIALIZER_H

View File

@ -239,13 +239,6 @@ public: // math operators with scalars
Vector& operator*=(value_type) _tvmet_always_inline;
Vector& operator/=(value_type) _tvmet_always_inline;
Vector& operator%=(int) _tvmet_always_inline;
Vector& operator^=(int) _tvmet_always_inline;
Vector& operator&=(int) _tvmet_always_inline;
Vector& operator|=(int) _tvmet_always_inline;
Vector& operator<<=(int) _tvmet_always_inline;
Vector& operator>>=(int) _tvmet_always_inline;
public: // math assign operators with vectors
// NOTE: access using the operators in ns element_wise, since that's what is does
template <class T2> Vector& M_add_eq(const Vector<T2, Size>&) _tvmet_always_inline;