Merge branch 'master' of https://github.com/UG4/ugcore

andreas.vogel · andreas.vogel · commit 03c6a5922cdb · 2018-12-21T16:59:22.000+01:00
diff --git a/ugbase/lib_disc/function_spaces/local_transfer.h b/ugbase/lib_disc/function_spaces/local_transfer.h
@@ -522,7 +522,7 @@ class CrouzeixRaviartElemTransfer
 					vParentElem[p] = vElem[p];
 
 			//	call prolongation
-				prolongate<TSide>(vParentElem, vChildSide, vValueChild, vValueParent);
+				this->template prolongate<TSide>(vParentElem, vChildSide, vValueChild, vValueParent);
 			}
 
 		//	b) prolongation from a element
@@ -544,7 +544,7 @@ class CrouzeixRaviartElemTransfer
 				vParentElem[0] = parent;
 
 			//	call prolongation
-				prolongate<TSide>(vParentElem, vChildSide, vValueChild, vValueParent);
+				this->template prolongate<TSide>(vParentElem, vChildSide, vValueChild, vValueParent);
 			}
 		};
 

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ class CrouzeixRaviartElemTransfer`
`522`	`522`	`vParentElem[p] = vElem[p];`
`523`	`523`
`524`	`524`	`// call prolongation`
`525`		`- prolongate<TSide>(vParentElem, vChildSide, vValueChild, vValueParent);`
	`525`	`+ this->template prolongate<TSide>(vParentElem, vChildSide, vValueChild, vValueParent);`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`// b) prolongation from a element`
`@@ -544,7 +544,7 @@ class CrouzeixRaviartElemTransfer`
`544`	`544`	`vParentElem[0] = parent;`
`545`	`545`
`546`	`546`	`// call prolongation`
`547`		`- prolongate<TSide>(vParentElem, vChildSide, vValueChild, vValueParent);`
	`547`	`+ this->template prolongate<TSide>(vParentElem, vChildSide, vValueChild, vValueParent);`
`548`	`548`	`}`
`549`	`549`	`};`
`550`	`550`