some cleanup

2 files changed, 9 insertions, 23 deletions

diff --git a/tvmet-1.7.1/include/tvmet/CommaInitializer.h b/tvmet-1.7.1/include/tvmet/CommaInitializer.h
index 24607d84c..6ec605c3b 100644
--- a/tvmet-1.7.1/include/tvmet/CommaInitializer.h
+++ b/tvmet-1.7.1/include/tvmet/CommaInitializer.h
@@ -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
diff --git a/tvmet-1.7.1/include/tvmet/Vector.h b/tvmet-1.7.1/include/tvmet/Vector.h
index 573acd99a..275355f3e 100644
--- a/tvmet-1.7.1/include/tvmet/Vector.h
+++ b/tvmet-1.7.1/include/tvmet/Vector.h
@@ -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;