Merge branch 'cherry-pick-4bfc2227' into 'releases/2.6-1'

Merge branch 'fix/compatibility-with-mac' into 'master'

See merge request !12

dune/subgrid/subgrid/subgridfaceiterator.hh

@@ -338,7 +338,7 @@ protected:
         {
             index_ = -1;
             const HostElement& e = *it_;
-            for(uint i=0; i < e.subEntities(1); ++i)
+            for(unsigned int i=0; i < e.subEntities(1); ++i)
                 if (Base::isSubFace(father, fatherFace, e, i)) {
                     index_ = i;
                     break;

dune/subgrid/subgrid/subgridindexstorage.hh

@@ -834,7 +834,7 @@ class SubGridVectorSubindexSetter
         //! \todo Please doc me !
         static void insertSubEntities(SubGridVectorIndexStorage<GridType>& indexStorage, const Element& e, bool isLeaf, int level)
         {
-            for(uint i=0; i < e.subEntities(codim); ++i)
+            for(unsigned int i=0; i < e.subEntities(codim); ++i)
             {
                 // get host index and GeometryType index of entity
                 int hostIndex = indexStorage.template getHostLevelSubIndex<0>(level, e, i, codim);
@@ -863,7 +863,7 @@ class SubGridVectorSubindexSetter
                                 nonLeafCopyFound = false;
                                 father = father.father();
                                 --fatherLevel;
-                                for(uint j=0; j < father.subEntities(codim); ++j)
+                                for(unsigned int j=0; j < father.subEntities(codim); ++j)
                                 {
                                     // if subentity is copy of ancestor subentity
                                     //     copy leaf index from father subentity

dune/subgrid/subgrid/subgridleafintersectioniterator.hh

@@ -2,7 +2,7 @@
 #define DUNE_SUBGRID_SUBGRID_LEAF_INTERSECTION_ITERATOR_HH
 
 #include <list>
-#include <tr1/memory>
+#include <memory>
 #include <dune/common/shared_ptr.hh>
 
 #include <dune/subgrid/subgrid/subgridfaceiterator.hh>

dune/subgrid/subgrid/subgridlevelintersectioniterator.hh

@@ -2,7 +2,7 @@
 #define DUNE_SUBGRID_SUBGRID_LEVEL_INTERSECTION_ITERATOR_HH
 
 #include <list>
-#include <tr1/memory>
+#include <memory>
 #include <dune/common/shared_ptr.hh>
 
 /** \file