Merge remote-tracking branch 'tobias/master'

dune/stuff/common/float_cmp.hh

@@ -68,8 +68,8 @@ namespace FloatCmp {
     return true;                                                                                                       \
   }                                                                                                                    \
   template <class F, class S, Dune::FloatCmp::CmpStyle style = Dune::FloatCmp::defaultCmpStyle>                        \
-  bool id(const Stuff::LA::VectorInterface<F>& first,                                                                  \
-          const Stuff::LA::VectorInterface<S>& second,                                                                 \
+  bool id(const Stuff::LA::VectorInterface<F, typename F::ScalarType>& first,                                          \
+          const Stuff::LA::VectorInterface<S, typename S::ScalarType>& second,                                         \
           typename Dune::FloatCmp::EpsilonType<typename F::ScalarType>::Type epsilon =                                 \
               Dune::FloatCmp::DefaultEpsilon<typename F::ScalarType, style>::value())                                  \
   {                                                                                                                    \

dune/stuff/common/vector.hh

@@ -29,10 +29,10 @@ inline void DUNE_DEPRECATED_MSG("Use *= 0 instead!") clear(Dune::DenseVector<Vec
   vector *= typename Dune::DenseVector<VectorImp>::value_type(0);
 }
 
-template <class T>
-inline void DUNE_DEPRECATED_MSG("Use *= 0 instead!") clear(LA::VectorInterface<T>& vector)
+template <class T, class S = double>
+inline void DUNE_DEPRECATED_MSG("Use *= 0 instead!") clear(LA::VectorInterface<T, S>& vector)
 {
-  vector *= typename LA::VectorInterface<T>::ScalarType(0);
+  vector *= typename LA::VectorInterface<T, S>::ScalarType(0);
 }