fix operator clashes for Fieldvector<K,1> and K

[[Imported from SVN: r5219]]

common/fvector.hh

@@ -880,20 +880,6 @@ namespace Dune {
     }
     //===== vector space arithmetic
 
-    //! vector space addition
-    FieldVector& operator+= (const FieldVector& y)
-    {
-      p += y.p;
-      return *this;
-    }
-
-    //! vector space subtraction
-    FieldVector& operator-= (const FieldVector& y)
-    {
-      p -= y.p;
-      return *this;
-    }
-
     //! vector space add scalar to each comp
     FieldVector& operator+= (const K& k)
     {
@@ -929,15 +915,11 @@ namespace Dune {
       return *this;
     }
 
-#ifndef DUNE_EXPRESSIONTEMPLATES
-    //===== Euclidean scalar product
-
     //! scalar product
-    inline K operator* ( const FieldVector &y ) const
+    inline K operator* ( const K & k ) const
     {
-      return p * y[ 0 ];
+      return p * k;
     }
-#endif
 
     //===== norms
 

common/test/fvectortest.cc

@@ -67,6 +67,13 @@ public:
     v = a - v;
     v = a * v;
     v = a / v;
+
+    v -= v;
+    v -= a;
+    v += v;
+    v += a;
+    v *= a;
+    v /= a;
   }
 };