From 4d4c7d0eed576f9d22ac5ce8391ca2ec4e043daf Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 7 Sep 2015 11:08:41 +0100
Subject: [PATCH] Intel 2016 compiler porting

---
 .../octreeData/octreeDataTriSurfaceTreeLeaf.H |  2 +-
 src/surfMesh/MeshedSurface/MeshedSurface.C    | 30 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.H b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.H
index 4887ece59..58c86adb6 100644
--- a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.H
+++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.H
@@ -45,7 +45,7 @@ namespace Foam
 // Forward declaration of classes
 class octreeDataTriSurface;
 
-template<> inline
+template<>
 bool treeLeaf<octreeDataTriSurface>::findNearest
 (
     const octreeDataTriSurface& shapes,
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index a7205d8b6..5bb0cda5d 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -32,6 +32,8 @@ License
 #include "polyBoundaryMesh.H"
 #include "polyMesh.H"
 #include "surfMesh.H"
+#include "Xfer.H"
+#include "surfZone.H"
 #include "primitivePatch.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -170,9 +172,9 @@ Foam::MeshedSurface<Face>::MeshedSurface()
 template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface
 (
-    const Xfer< pointField >& pointLst,
-    const Xfer< List<Face> >& faceLst,
-    const Xfer< surfZoneList >& zoneLst
+    const Xfer<pointField >& pointLst,
+    const Xfer<List<Face> >& faceLst,
+    const Xfer<surfZoneList>& zoneLst
 )
 :
     ParentType(List<Face>(), pointField()),
@@ -185,8 +187,8 @@ Foam::MeshedSurface<Face>::MeshedSurface
 template<class Face>
 Foam::MeshedSurface<Face>::MeshedSurface
 (
-    const Xfer< pointField >& pointLst,
-    const Xfer< List<Face> >& faceLst,
+    const Xfer<pointField>& pointLst,
+    const Xfer<List<Face> >& faceLst,
     const UList<label>& zoneSizes,
     const UList<word>& zoneNames
 )
@@ -534,17 +536,17 @@ void Foam::MeshedSurface<Face>::reset
 
     // Take over new primitive data.
     // Optimized to avoid overwriting data at all
-    if (!pointLst().empty())
+    if (!pointLst->empty())
     {
         storedPoints().transfer(pointLst());
     }
 
-    if (!faceLst().empty())
+    if (!faceLst->empty())
     {
         storedFaces().transfer(faceLst());
     }
 
-    if (!zoneLst().empty())
+    if (!zoneLst->empty())
     {
         storedZones().transfer(zoneLst());
     }
@@ -554,26 +556,26 @@ void Foam::MeshedSurface<Face>::reset
 template<class Face>
 void Foam::MeshedSurface<Face>::reset
 (
-    const Xfer< List<point> >& pointLst,
-    const Xfer< List<Face> >& faceLst,
-    const Xfer< surfZoneList >& zoneLst
+    const Xfer<List<point> >& pointLst,
+    const Xfer<List<Face> >& faceLst,
+    const Xfer<surfZoneList>& zoneLst
 )
 {
     ParentType::clearOut();
 
     // Take over new primitive data.
     // Optimized to avoid overwriting data at all
-    if (!pointLst().empty())
+    if (!pointLst->empty())
     {
         storedPoints().transfer(pointLst());
     }
 
-    if (!faceLst().empty())
+    if (!faceLst->empty())
     {
         storedFaces().transfer(faceLst());
     }
 
-    if (!zoneLst().empty())
+    if (!zoneLst->empty())
     {
         storedZones().transfer(zoneLst());
     }