From eb73c6925b201c7066caa7fe6c2a2edbc2e540ae Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 6 Oct 2008 11:08:53 +0200
Subject: [PATCH] Added xfer<T> constructors for the various list-types

---
 .../containers/Lists/CompactListList/CompactListList.C    | 6 ++++++
 .../containers/Lists/CompactListList/CompactListList.H    | 3 +++
 src/OpenFOAM/containers/Lists/List/List.C                 | 8 ++++++++
 src/OpenFOAM/containers/Lists/List/List.H                 | 4 ++++
 src/OpenFOAM/containers/Lists/PackedList/PackedList.C     | 8 ++++++++
 src/OpenFOAM/containers/Lists/PackedList/PackedList.H     | 3 +++
 src/OpenFOAM/containers/Lists/PtrList/PtrList.C           | 7 +++++++
 src/OpenFOAM/containers/Lists/PtrList/PtrList.H           | 3 +++
 src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C         | 7 +++++++
 src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H         | 3 +++
 10 files changed, 52 insertions(+)

diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 9be79966c6..f6d8cb6218 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -92,6 +92,12 @@ CompactListList<T>::CompactListList(const UList<label>& rowSizes, const T& t)
 }
 
 
+template<class T>
+CompactListList<T>::CompactListList(xfer<CompactListList<T> >& lst)
+{
+    transfer(lst.ref());
+}
+
 template<class T>
 CompactListList<T>::CompactListList(CompactListList<T>& cll, bool reUse)
 :
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 80bfee1b1e..d88b87ac3a 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -103,6 +103,9 @@ public:
         //- Construct given list of row-sizes
         CompactListList(const UList<label>& rowSizes, const T&);
 
+        //- Construct by transferring the parameter contents
+        CompactListList(xfer<CompactListList<T> >&);
+
         //- Construct as copy or re-use as specified.
         CompactListList(CompactListList<T>&, bool reUse);
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index a599490781..46c67c84be 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -125,6 +125,14 @@ Foam::List<T>::List(const List<T>& a)
 }
 
 
+// Construct by transferring the parameter contents
+template<class T>
+Foam::List<T>::List(xfer<List<T> >& lst)
+{
+    transfer(lst.ref());
+}
+
+
 // Construct as copy or re-use as specified.
 template<class T>
 Foam::List<T>::List(List<T>& a, bool reUse)
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 1f0d64fba4..6c4a46db78 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -43,6 +43,7 @@ SourceFiles
 
 #include "UList.H"
 #include "autoPtr.H"
+#include "xfer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,6 +94,9 @@ public:
         //- Copy constructor.
         List(const List<T>&);
 
+        //- Construct by transferring the parameter contents
+        List(xfer<List<T> >&);
+
         //- Construct as copy or re-use as specified.
         List(List<T>&, bool reUse);
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 7c20b200b3..a96ac8a297 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -44,6 +44,7 @@ PackedList<nBits>::PackedList(const label size, const unsigned int val)
 }
 
 
+
 //- Copy constructor.
 template<int nBits>
 PackedList<nBits>::PackedList(const PackedList<nBits>& PList)
@@ -53,6 +54,13 @@ PackedList<nBits>::PackedList(const PackedList<nBits>& PList)
 {}
 
 
+template<int nBits>
+PackedList<nBits>::PackedList(xfer<PackedList<nBits> >& lst)
+{
+    transfer(lst.ref());
+}
+
+
 //- Construct from labelList
 template<int nBits>
 PackedList<nBits>::PackedList(const labelList& lst)
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 5a966c6e68..1fe4eeec71 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -134,6 +134,9 @@ public:
         //- Copy constructor.
         PackedList(const PackedList<nBits>& PList);
 
+        //- Construct by transferring the parameter contents
+        PackedList(xfer<PackedList<nBits> >&);
+
         //- Construct from labelList.
         PackedList(const labelList&);
 
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index 92caee45c3..cf8cf4c444 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -71,6 +71,13 @@ Foam::PtrList<T>::PtrList(const PtrList<T>& a, const CloneArg& cloneArg)
 }
 
 
+template<class T>
+Foam::PtrList<T>::PtrList(xfer<PtrList<T> >& lst)
+{
+    transfer(lst.ref());
+}
+
+
 template<class T>
 Foam::PtrList<T>::PtrList(PtrList<T>& a, bool reUse)
 :
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index 2a4ab2a46c..5de1722699 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -129,6 +129,9 @@ public:
         template<class CloneArg>
         PtrList(const PtrList<T>&, const CloneArg&);
 
+        //- Construct by transferring the parameter contents
+        PtrList(xfer<PtrList<T> >&);
+
         //- Construct as copy or re-use as specified.
         PtrList(PtrList<T>&, bool reUse);
 
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index 29089c4660..10d0aa7f24 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
@@ -50,6 +50,13 @@ UPtrList<T>::UPtrList(const label s)
 {}
 
 
+template<class T>
+UPtrList<T>::UPtrList(xfer<UPtrList<T> >& lst)
+{
+    transfer(lst.ref());
+}
+
+
 template<class T>
 UPtrList<T>::UPtrList(UPtrList<T>& a, bool reUse)
 :
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index 48c4715f45..03f5b455b4 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -110,6 +110,9 @@ public:
         //- Construct with length specified.
         explicit UPtrList(const label);
 
+        //- Construct by transferring the parameter contents
+        UPtrList(xfer<UPtrList<T> >&);
+
         //- Construct as copy or re-use as specified.
         UPtrList(UPtrList<T>&, bool reUse);