From 6bb5b903fb9693a83b1e310ac244c1e1ab29f95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kl=C3=B6fkorn?=
<robertk@mathematik.uni-stuttgart.de>
Date: Mon, 19 Nov 2007 11:22:29 +0000
Subject: [PATCH] renamed restrict and prolong to make compile with xlC 8.0
git-svn-id: https://dune.mathematik.uni-freiburg.de/svn/alugrid/trunk@980 0d966ed9-3843-0410-af09-ebfb50bd7c74
---
src/alu2d/triang.cc | 8 ++++----
src/alu2d/triang.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/alu2d/triang.cc b/src/alu2d/triang.cc
index efa7aa54d..29c1b6793 100644
--- a/src/alu2d/triang.cc
+++ b/src/alu2d/triang.cc
@@ -2042,7 +2042,7 @@ void Bndel::c::read(ifstream & in, Vertex ** v, const int l) {
}
-void Bndel_triang::restrict(Bndel **pbel, int pnr)
+void Bndel_triang::restrictLocal(Bndel **pbel, int pnr)
{
assert( ((Bndel_triang*)(pbel[0]))->time
== ((Bndel_triang*)(pbel[1]))->time);
@@ -2050,7 +2050,7 @@ void Bndel_triang::restrict(Bndel **pbel, int pnr)
time = ((Bndel_triang*)(pbel[0]))->time;
}
-void Bndel_triang::prolong(Bndel **pbel, int pnr) const
+void Bndel_triang::prolongLocal(Bndel **pbel, int pnr) const
{
for (int i=0;i<pnr;i++)
((Bndel_triang*)(pbel[i]))->time = time;
@@ -2113,7 +2113,7 @@ int Bndel_triang::split(void * (&e)[nparts], Listagency < Vertex > * agnc,
t2->edgeconnect(0,ncv->el[1]->edge(idx[1]));
e[0]=t1;
e[1]=t2;
- prolong((Bndel **)e,2);
+ prolongLocal((Bndel **)e,2);
delete ncv;
ncv=NULL;
@@ -2130,7 +2130,7 @@ int Bndel_triang::docoarsen(nconf_vtx_t *ncv,
Bndel *bel[2];
bel[0]=down();
bel[1]=down()->next();
- restrict(bel,2);
+ restrictLocal(bel,2);
deletesubtree();
mysplit = unsplit;
return 1;
diff --git a/src/alu2d/triang.h b/src/alu2d/triang.h
index 35fc2784f..64c448a3f 100644
--- a/src/alu2d/triang.h
+++ b/src/alu2d/triang.h
@@ -73,9 +73,9 @@ class Bndel_triang : public Hier < Bndel > {
double time;
- virtual void restrict(Bndel **, int);
+ virtual void restrictLocal(Bndel **, int);
- virtual void prolong(Bndel **, int) const;
+ virtual void prolongLocal(Bndel **, int) const;
public :
--
GitLab