From 91cb6d291217e22e2242a666ce842729115ed4f1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 17 Oct 2008 18:27:11 +0200
Subject: [PATCH] xfer class modifications:

  - removed operator* in favour of operator() for consistency with tmp
    class. The previous use of operator() for const casting didn't work
    anyhow due to template confusion.
  - added xferCopy(), xferMove() and xferTmp() template functions instead
  - preliminary changes to IOobjects and Fields for xfer
---
 applications/test/xfer/xferListTest.C         | 24 +++----
 .../HashTables/HashTable/HashTable.C          |  2 +-
 .../StaticHashTable/StaticHashTable.C         |  2 +-
 .../Lists/CompactListList/CompactListList.C   |  2 +-
 src/OpenFOAM/containers/Lists/List/List.C     |  2 +-
 .../containers/Lists/PackedList/PackedList.C  |  2 +-
 .../containers/Lists/PtrList/PtrList.C        |  2 +-
 .../Lists/SortableList/SortableList.C         |  4 +-
 .../containers/Lists/UPtrList/UPtrList.C      |  2 +-
 src/OpenFOAM/db/IOobjects/IOField/IOField.C   | 19 ++++++
 src/OpenFOAM/db/IOobjects/IOField/IOField.H   |  7 +-
 src/OpenFOAM/db/IOobjects/IOList/IOList.C     | 19 ++++++
 src/OpenFOAM/db/IOobjects/IOList/IOList.H     |  3 +
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.C       | 19 ++++++
 src/OpenFOAM/db/IOobjects/IOMap/IOMap.H       |  7 +-
 .../db/IOobjects/IOPtrList/IOPtrList.C        | 19 ++++++
 .../db/IOobjects/IOPtrList/IOPtrList.H        |  3 +
 .../DimensionedField/DimensionedField.C       | 35 ++++++++--
 .../DimensionedField/DimensionedField.H       | 15 ++++-
 .../FieldFields/FieldField/FieldField.H       |  1 +
 src/OpenFOAM/fields/Fields/Field/Field.C      | 21 ++++++
 src/OpenFOAM/fields/Fields/Field/Field.H      | 10 +++
 src/OpenFOAM/memory/xfer/xfer.H               | 65 +++++++++++--------
 src/OpenFOAM/memory/xfer/xferI.H              | 10 +--
 24 files changed, 229 insertions(+), 66 deletions(-)

diff --git a/applications/test/xfer/xferListTest.C b/applications/test/xfer/xferListTest.C
index ed52115c93..0089569394 100644
--- a/applications/test/xfer/xferListTest.C
+++ b/applications/test/xfer/xferListTest.C
@@ -52,35 +52,35 @@ int main(int argc, char *argv[])
     Info<< "lstA: " << lstA << endl;
     Info<< "lstC: " << lstC << endl;
 
-    xfer<List<label> > xA(lstA, true);
+    xfer<List<label> > xA = xferMove(lstA);
     xfer<List<label> > xB;
 
     List<label> lstB( xA );
 
-    Info<< "xA: " << *xA << endl;
-    Info<< "xB: " << *xB << endl;
+    Info<< "xA: " << xA() << endl;
+    Info<< "xB: " << xB() << endl;
     Info<< "lstA: " << lstA << endl;
     Info<< "lstB: " << lstB << endl;
     Info<< "lstC: " << lstC << endl;
 
     xA = lstB;
 
-    Info<< "xA: " << *xA << endl;
-    Info<< "xB: " << *xB << endl;
+    Info<< "xA: " << xA() << endl;
+    Info<< "xB: " << xB() << endl;
     Info<< "lstA: " << lstA << endl;
     Info<< "lstB: " << lstB << endl;
     Info<< "lstC: " << lstC << endl;
 
     xB = xA;
     
-    List<label> lstD( xferCopy(List<label>, lstC) );
-    List<label> lstE( xferMove(List<label>, lstC) );
+    List<label> lstD(xferCopy(lstC));
+    List<label> lstE(xferMove(lstC));
     
     // this must be empty
-    List<label> lstF( xferCopy(List<label>, lstC) );
+    List<label> lstF = xferCopy(lstC);
 
-    Info<< "xA: " << *xA << endl;
-    Info<< "xB: " << *xB << endl;
+    Info<< "xA: " << xA() << endl;
+    Info<< "xB: " << xB() << endl;
     Info<< "lstA: " << lstA << endl;
     Info<< "lstB: " << lstB << endl;
     Info<< "lstC: " << lstC << endl;
@@ -88,12 +88,12 @@ int main(int argc, char *argv[])
     Info<< "lstE: " << lstE << endl;
     Info<< "lstF: " << lstF << endl;
 
-    Info<< "xB size: " << *xB << endl;
+    Info<< "xB size: " << xB->size() << endl;
 
     // clear the underlying List
     xB->clear();
 
-    Info<< "xB size: " << *xB << endl;
+    Info<< "xB size: " << xB->size() << endl;
 
     return 0;
 }
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 676d579bb8..d9d74fd1ad 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -93,7 +93,7 @@ HashTable<T, Key, Hash>::HashTable(const xfer<HashTable<T, Key, Hash> >& ht)
     endIter_(*this, NULL, 0),
     endConstIter_(*this, NULL, 0)
 {
-    transfer(*ht);
+    transfer(ht());
 }
 
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index 688abd467d..c4afe4c044 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
@@ -90,7 +90,7 @@ StaticHashTable<T, Key, Hash>::StaticHashTable
     endIter_(*this, 0, 0),
     endConstIter_(*this, 0, 0)
 {
-    transfer(*ht);
+    transfer(ht());
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 1f683d98a5..614bcc08f1 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -95,7 +95,7 @@ CompactListList<T>::CompactListList(const UList<label>& rowSizes, const T& t)
 template<class T>
 CompactListList<T>::CompactListList(const xfer<CompactListList<T> >& lst)
 {
-    transfer(*lst);
+    transfer(lst());
 }
 
 template<class T>
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 02e83b011b..d6c8280264 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -129,7 +129,7 @@ Foam::List<T>::List(const List<T>& a)
 template<class T>
 Foam::List<T>::List(const xfer<List<T> >& lst)
 {
-    transfer(*lst);
+    transfer(lst());
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 23e72713bf..8c31ea0854 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -57,7 +57,7 @@ PackedList<nBits>::PackedList(const PackedList<nBits>& PList)
 template<int nBits>
 PackedList<nBits>::PackedList(const xfer<PackedList<nBits> >& lst)
 {
-    transfer(*lst);
+    transfer(lst());
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index 68c5d613a0..561dff8b25 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -74,7 +74,7 @@ Foam::PtrList<T>::PtrList(const PtrList<T>& a, const CloneArg& cloneArg)
 template<class T>
 Foam::PtrList<T>::PtrList(const xfer<PtrList<T> >& lst)
 {
-    transfer(*lst);
+    transfer(lst());
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
index 1f3f53a165..7ebfa9de9e 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
@@ -45,9 +45,9 @@ template <class Type>
 Foam::SortableList<Type>::SortableList(const xfer<List<Type> >& values)
 :
     List<Type>(),
-    indices_((*values).size())
+    indices_(values->size())
 {
-    List<Type>::transfer(*values);
+    List<Type>::transfer(values());
     sort();
 }
 
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index 8a2336922c..7321f791b8 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
@@ -53,7 +53,7 @@ UPtrList<T>::UPtrList(const label s)
 template<class T>
 UPtrList<T>::UPtrList(const xfer<UPtrList<T> >& lst)
 {
-    transfer(*lst);
+    transfer(lst());
 }
 
 
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 973f7de1c1..3e927fd3d0 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
@@ -87,6 +87,25 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
 }
 
 
+template<class Type>
+Foam::IOField<Type>::IOField(const IOobject& io, const xfer<Field<Type> >& f)
+:
+    regIOobject(io)
+{
+    Field<Type>::transfer(f());
+
+    if
+    (
+        io.readOpt() == IOobject::MUST_READ
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readStream(typeName) >> *this;
+        close();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index e42cca65db..0cd06bdb09 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -65,11 +65,14 @@ public:
         //- Construct from IOobject
         IOField(const IOobject&);
 
+        //- Construct from IOobject and size (does not set values)
+        IOField(const IOobject&, const label size);
+
         //- Construct from components
         IOField(const IOobject&, const Field<Type>&);
 
-        //- Construct from IOobject and size (does not set values)
-        IOField(const IOobject&, const label size);
+        //- Construct by transferring the Field contents
+        IOField(const IOobject&, const xfer<Field<Type> >&);
 
 
     // Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index 11a80cbb2c..fc9f4498d4 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
@@ -87,6 +87,25 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
 }
 
 
+template<class T>
+Foam::IOList<T>::IOList(const IOobject& io, const xfer<List<T> >& list)
+:
+    regIOobject(io)
+{
+    List<T>::transfer(list());
+
+    if
+    (
+        io.readOpt() == IOobject::MUST_READ
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readStream(typeName) >> *this;
+        close();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index d7ab7ec688..1bf7f34fcc 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -72,6 +72,9 @@ public:
         //- Construct from IOobject and a List
         IOList(const IOobject&, const List<T>&);
 
+        //- Construct by transferring the List contents
+        IOList(const IOobject&, const xfer<List<T> >&);
+
 
     // Destructor
 
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
index dffbda46d6..1c15804a4d 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
@@ -86,6 +86,25 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Map<T>& map)
 }
 
 
+template<class T>
+Foam::IOMap<T>::IOMap(const IOobject& io, const xfer<Map<T> >& map)
+:
+    regIOobject(io)
+{
+    Map<T>::transfer(map());
+
+    if
+    (
+        io.readOpt() == IOobject::MUST_READ
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readStream(typeName) >> *this;
+        close();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index e2c503ae46..dd86337f3f 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
@@ -66,11 +66,14 @@ public:
         //- Construct from IOobject
         IOMap(const IOobject&);
 
+        //- Construct from IOobject and size of Map
+        IOMap(const IOobject&, const label);
+
         //- Construct from IOobject and a Map
         IOMap(const IOobject&, const Map<T>&);
 
-        //- Construct from IOobject and size of Map
-        IOMap(const IOobject&, const label);
+        //- Construct by transferring the Map contents
+        IOMap(const IOobject&, const xfer<Map<T> >&);
 
 
     // Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index e6fae97c27..4197a74ee9 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
@@ -84,6 +84,25 @@ Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const PtrList<T>& list)
 }
 
 
+template<class T>
+Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const xfer<PtrList<T> >& list)
+:
+    regIOobject(io)
+{
+    PtrList<T>::transfer(list());
+
+    if
+    (
+        io.readOpt() == IOobject::MUST_READ
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        PtrList<T>::read(readStream(typeName), INew<T>());
+        close();
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
index 27ab0bbb5a..cb23363c05 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
@@ -73,6 +73,9 @@ public:
         //- Construct from IOobject and a PtrList
         IOPtrList(const IOobject&, const PtrList<T>&);
 
+        //- Construct by transferring the PtrList contents
+        IOPtrList(const IOobject&, const xfer<PtrList<T> >&);
+
 
     // Destructor
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 67100f518b..41e0bcf131 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -138,6 +138,19 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 {}
 
 
+template<class Type, class GeoMesh>
+DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const xfer<DimensionedField<Type, GeoMesh> >& df
+)
+:
+    regIOobject(df(), true),
+    Field<Type>(df),
+    mesh_(df->mesh_),
+    dimensions_(df->dimensions_)
+{}
+
+
 #ifdef ConstructFromTmp
 template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
@@ -202,6 +215,20 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 {}
 
 
+template<class Type, class GeoMesh>
+DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const word& newName,
+    const xfer<DimensionedField<Type, GeoMesh> >& df
+)
+:
+    regIOobject(IOobject(newName, df->time().timeName(), df->db())),
+    Field<Type>(df),
+    mesh_(df->mesh_),
+    dimensions_(df->dimensions_)
+{}
+
+
 #ifdef ConstructFromTmp
 template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
@@ -248,7 +275,7 @@ DimensionedField<Type, GeoMesh>::~DimensionedField()
 template<class Type, class GeoMesh>
 const DimensionedField<Type, GeoMesh>& DimensionedField<Type, GeoMesh>::null()
 {
-    DimensionedField<Type, GeoMesh>* nullPtr = 
+    DimensionedField<Type, GeoMesh>* nullPtr =
         reinterpret_cast<DimensionedField<Type, GeoMesh>*>(NULL);
     return *nullPtr;
 }
@@ -258,8 +285,8 @@ template<class Type, class GeoMesh>
 tmp
 <
     DimensionedField
-        <typename DimensionedField<Type, GeoMesh>::cmptType, GeoMesh> 
-> 
+        <typename DimensionedField<Type, GeoMesh>::cmptType, GeoMesh>
+>
 DimensionedField<Type, GeoMesh>::component
 (
     const direction d
@@ -315,7 +342,7 @@ void DimensionedField<Type, GeoMesh>::replace
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<Type, GeoMesh> > 
+tmp<DimensionedField<Type, GeoMesh> >
 DimensionedField<Type, GeoMesh>::T() const
 {
     tmp<DimensionedField<Type, GeoMesh> > result
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index 8a3fbea757..0035427672 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -49,7 +49,7 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
- 
+
 template<class Type, class GeoMesh> class DimensionedField;
 
 template<class Type, class GeoMesh> Ostream& operator<<
@@ -156,6 +156,12 @@ public:
             bool reUse
         );
 
+        //- Construct by transferring the DimensionedField
+        DimensionedField
+        (
+            const xfer<DimensionedField<Type, GeoMesh> >&
+        );
+
         //- Construct as copy of tmp<DimensionedField> deleting argument
 #       ifdef ConstructFromTmp
         DimensionedField
@@ -186,6 +192,13 @@ public:
             bool reUse
         );
 
+        //- Construct by transferring the DimensionedField with a new name
+        DimensionedField
+        (
+            const word& newName,
+            const xfer<DimensionedField<Type, GeoMesh> >&
+        );
+
         //- Construct as copy resetting name
 #       ifdef ConstructFromTmp
         DimensionedField
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 958e2f259b..4d7bb8552d 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -37,6 +37,7 @@ SourceFiles
 #define FieldField_H
 
 #include "tmp.H"
+#include "xfer.H"
 #include "PtrList.H"
 #include "scalar.H"
 #include "direction.H"
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index c14b08b2b9..994f8ee630 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -155,6 +155,13 @@ Field<Type>::Field(Field<Type>& f, bool reUse)
 {}
 
 
+template<class Type>
+Field<Type>::Field(const xfer<Field<Type> >& f)
+:
+    List<Type>(f)
+{}
+
+
 template<class Type>
 Field<Type>::Field(const typename Field<Type>::subField& sf)
 :
@@ -568,6 +575,20 @@ void Field<Type>::replace
 }
 
 
+template<class Type>
+void Field<Type>::transfer(Field<Type>& f)
+{
+    List<Type>::transfer(f);
+}
+
+
+template<class Type>
+void Field<Type>::transfer(List<Type>& lst)
+{
+    List<Type>::transfer(lst);
+}
+
+
 template<class Type>
 tmp<Field<Type> > Field<Type>::T() const
 {
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 3c60dcf126..8e168cb0ac 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -43,6 +43,7 @@ SourceFiles
 #define Field_H
 
 #include "tmp.H"
+#include "xfer.H"
 #include "direction.H"
 #include "VectorSpace.H"
 #include "scalarList.H"
@@ -164,6 +165,9 @@ public:
         //- Construct as copy or re-use as specified.
         Field(Field<Type>&, bool reUse);
 
+        //- Construct by transferring the Field contents
+        Field(const xfer<Field<Type> >&);
+
         //- Construct as copy of subField
         Field(const typename Field<Type>::subField&);
 
@@ -293,6 +297,12 @@ public:
         //- Replace a component field of the field
         void replace(const direction, const cmptType&);
 
+        //- Transfer the contents of the argument Field into this Field
+        void transfer(Field<Type>&);
+
+        //- Transfer the contents of the argument List into this Field
+        void transfer(List<Type>&);
+
         //- Return the field transpose (only defined for second rank tensors)
         tmp<Field<Type> > T() const;
 
diff --git a/src/OpenFOAM/memory/xfer/xfer.H b/src/OpenFOAM/memory/xfer/xfer.H
index 653f4115db..e13782c9f4 100644
--- a/src/OpenFOAM/memory/xfer/xfer.H
+++ b/src/OpenFOAM/memory/xfer/xfer.H
@@ -39,10 +39,6 @@ Description
     The wrapped object of type \<T\> must implement a transfer() method and
     an operator=() copy method.
 
-Note
-    The macros xferCopy(T,arg) and xferMove(T,arg) can be used as
-    workarounds for passing temporaries to copy-constructors.
-
 SourceFiles
     xferI.H
 
@@ -56,6 +52,9 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
+template<class T> class tmp;
+
 /*---------------------------------------------------------------------------*\
                            Class xfer Declaration
 \*---------------------------------------------------------------------------*/
@@ -97,12 +96,8 @@ public:
         //- Transfer the contents into the object
         inline void operator=(const xfer<T>&);
 
-        //- Return a non-const reference to const object
-        //  @sa xferCopy, xferMove macros alternatives for copy-constructors
-        inline const xfer<T>& operator()() const;
-
         //- Reference to the underlying datatype
-        inline T& operator*() const;
+        inline T& operator()() const;
 
         //- Pointer to the underlying datatype
         inline T* operator->() const;
@@ -112,40 +107,54 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
-
 /**
- * @def xferCopy(T,arg)
+ * @fn template<class T> xferCopy(const T&)
  * Construct by copying the contents of the @a arg
- * and return a const reference to an xfer of type \<T\>
  *
- * Useful for constructors where the argument is temporary.
- * This is a workaround for a template resolution issue.
- *
- * @sa xferMove and Foam::xfer
+ * @sa xferMove, xferTmp and Foam::xfer
 */
-#define xferCopy(T,arg) \
-    (static_cast<const Foam::xfer< T >&>(Foam::xfer< T >(arg)()))
+template<class T>
+Foam::xfer<T> xferCopy(const T& t)
+{
+    return Foam::xfer<T>(t);
+}
+
 
 /**
- * @def xferMove(T,arg)
+ * @fn template<class T> xferMove(T&)
  * Construct by transferring the contents of the @a arg
- * and return a const reference to an xfer of type \<T\>
- *
- * Useful for constructors where the argument is temporary.
- * This is a workaround for a template resolution issue.
  *
  * @par Example Use
  * @code
  *     List<label> a;
  *     ...
- *     List<label> b(xferMove(List<label>, a));
+ *     List<label> b(xferMove(a));
  * @endcode
  *
- * @sa xferCopy and Foam::xfer
+ * @sa xferCopy, xferTmp and Foam::xfer
 */
-#define xferMove(T,arg) \
-    (static_cast<const Foam::xfer< T >&>(Foam::xfer< T >(arg, true)()))
+template<class T>
+Foam::xfer<T> xferMove(T& t)
+{
+    return Foam::xfer<T>(t, true);
+}
+
+
+/**
+ * @fn template<class T> xferTmp(tmp<T>&)
+ * Construct by transferring the contents of the @a arg
+ *
+ * @sa xferCopy, xferMove and Foam::xfer
+*/
+template<class T>
+Foam::xfer<T> xferTmp(Foam::tmp<T>& tt)
+{
+    return Foam::xfer<T>(tt(), tt.isTmp());
+}
+
+
+} // End namespace Foam
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/memory/xfer/xferI.H b/src/OpenFOAM/memory/xfer/xferI.H
index ff70fbf612..55830008a9 100644
--- a/src/OpenFOAM/memory/xfer/xferI.H
+++ b/src/OpenFOAM/memory/xfer/xferI.H
@@ -98,18 +98,12 @@ inline void Foam::xfer<T>::operator=(const xfer<T>& t)
 
 
 template<class T>
-inline const Foam::xfer<T>& Foam::xfer<T>::operator()() const
-{
-    return *this;
-}
-
-
-template<class T>
-inline T& Foam::xfer<T>::operator*() const
+inline T& Foam::xfer<T>::operator()() const
 {
     return *ptr_;
 }
 
+
 template<class T>
 inline T* Foam::xfer<T>::operator->() const
 {