From 4bca736fdb8ebff68fd033204fdceb3c53146327 Mon Sep 17 00:00:00 2001
From: youett <akbib@mi.fu-berlin.de>
Date: Mon, 16 Jul 2018 15:22:40 +0000
Subject: [PATCH] Merge branch 'fix/compatibility-with-mac' into 'master'
Fix/compatibility with mac
See merge request agnumpde/dune-subgrid!11
(cherry picked from commit 4bfc222753fd74b8c2dc8b61f49836791a251fa2)
2dda34fc [compatibility] Use unsigned int instead of uint
726861fe [compatibility] Use <memory> instead of <tr1/memory>
---
dune/subgrid/subgrid/subgridfaceiterator.hh | 2 +-
dune/subgrid/subgrid/subgridindexstorage.hh | 4 ++--
dune/subgrid/subgrid/subgridleafintersectioniterator.hh | 2 +-
dune/subgrid/subgrid/subgridlevelintersectioniterator.hh | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dune/subgrid/subgrid/subgridfaceiterator.hh b/dune/subgrid/subgrid/subgridfaceiterator.hh
index ffbd057..9bd06b4 100644
--- a/dune/subgrid/subgrid/subgridfaceiterator.hh
+++ b/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;
diff --git a/dune/subgrid/subgrid/subgridindexstorage.hh b/dune/subgrid/subgrid/subgridindexstorage.hh
index 26d100d..b22ff76 100644
--- a/dune/subgrid/subgrid/subgridindexstorage.hh
+++ b/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
diff --git a/dune/subgrid/subgrid/subgridleafintersectioniterator.hh b/dune/subgrid/subgrid/subgridleafintersectioniterator.hh
index aa87b00..0e1242e 100644
--- a/dune/subgrid/subgrid/subgridleafintersectioniterator.hh
+++ b/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>
diff --git a/dune/subgrid/subgrid/subgridlevelintersectioniterator.hh b/dune/subgrid/subgrid/subgridlevelintersectioniterator.hh
index 70e59b6..5d8d496 100644
--- a/dune/subgrid/subgrid/subgridlevelintersectioniterator.hh
+++ b/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
--
GitLab