Merge branch 'feature/fix-FS-1331-and-mr-2' into 'master'

Fixup for !2

Bug introduced in the fix of flyspray/FS#1331 and !2
revealed by simply building dune-istl.

See merge request !6

dune/istl/owneroverlapcopy.hh

@@ -427,7 +427,7 @@ namespace Dune {
      * @return The global euclidian norm of that vector.
      */
     template<class T1>
-    typename FieldTraits<field_type>::real_type norm (const T1& x) const
+    typename FieldTraits<typename T1::field_type>::real_type norm (const T1& x) const
     {
       // set up mask vector
       if (mask.size()!=static_cast<typename std::vector<double>::size_type>(x.size()))

dune/istl/paamg/test/pthreadtwoleveltest.cc

 #include"config.h"
 #include "anisotropic.hh"
 #include <dune/common/timer.hh>
+#include <dune/common/shared_ptr.hh>
 #include <dune/common/parallel/indexset.hh>
 #include <dune/common/parallel/collectivecommunication.hh>
 #include <dune/istl/paamg/twolevelmethod.hh>

dune/istl/paamg/test/twolevelmethodtest.cc

 #include"config.h"
 #include "anisotropic.hh"
 #include <dune/common/timer.hh>
+#include <dune/common/shared_ptr.hh>
 #include <dune/common/parallel/indexset.hh>
 #include <dune/common/parallel/collectivecommunication.hh>
 #include <dune/istl/paamg/twolevelmethod.hh>

dune/istl/scalarproducts.hh

@@ -45,7 +45,7 @@ namespace Dune {
     //! export types, they come from the derived class
     typedef X domain_type;
     typedef typename X::field_type field_type;
-    typedef typename FieldTraits<field_type>::real_type;
+    typedef typename FieldTraits<field_type>::real_type real_type;
 
     /*! \brief Dot product of two vectors.
        It is assumed that the vectors are consistent on the interior+border