From 41dcf4abfb82a0b1a16c0b60ba9a08bb9ef57b31 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 11 Oct 2012 18:10:39 +0100
Subject: [PATCH] OpenFOAM: added "transfer" constructor to tmp

Needed for return of tmp argument in "absolute" meshPhi function
---
 src/OpenFOAM/memory/tmp/tmp.H                 |  3 ++
 src/OpenFOAM/memory/tmp/tmpI.H                | 32 +++++++++++++++++++
 .../finiteVolume/fvc/fvcMeshPhi.C             |  4 +--
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 0bd3442d69..e8a9e852b2 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -79,6 +79,9 @@ public:
         //- Construct copy and increment reference count
         inline tmp(const tmp<T>&);
 
+        //- Construct copy transferring content of temporary if required
+        inline tmp(const tmp<T>&, bool allowTransfer);
+
 
     //- Destructor, delete object when reference count == 0
     inline ~tmp();
diff --git a/src/OpenFOAM/memory/tmp/tmpI.H b/src/OpenFOAM/memory/tmp/tmpI.H
index bfd3831692..98a947e284 100644
--- a/src/OpenFOAM/memory/tmp/tmpI.H
+++ b/src/OpenFOAM/memory/tmp/tmpI.H
@@ -68,6 +68,38 @@ inline Foam::tmp<T>::tmp(const tmp<T>& t)
 }
 
 
+template<class T>
+inline Foam::tmp<T>::tmp(const tmp<T>& t, bool allowTransfer)
+:
+    isTmp_(t.isTmp_),
+    ptr_(t.ptr_),
+    ref_(t.ref_)
+{
+    if (isTmp_)
+    {
+        if (allowTransfer)
+        {
+            const_cast<tmp<T>&>(t).ptr_ = 0;
+        }
+        else
+        {
+            if (ptr_)
+            {
+                ptr_->operator++();
+            }
+            else
+            {
+                FatalErrorIn
+                (
+                    "Foam::tmp<T>::tmp(const tmp<T>&, bool allowTransfer)"
+                )   << "attempted copy of a deallocated temporary"
+                    << abort(FatalError);
+            }
+        }
+    }
+}
+
+
 template<class T>
 inline Foam::tmp<T>::~tmp()
 {
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
index 3b5e98aae3..f3bf760877 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C
@@ -160,7 +160,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvc::absolute
     }
     else
     {
-        return tphi;
+        return tmp<surfaceScalarField>(tphi, true);
     }
 }
 
@@ -178,7 +178,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvc::absolute
     }
     else
     {
-        return tphi;
+        return tmp<surfaceScalarField>(tphi, true);
     }
 }