From 55d4fb2ec21cd84dbe1db132350b75a77ca88052 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 29 Jan 2009 14:51:51 +0100
Subject: [PATCH] PackedList with unsigned template parameter

---
 .../containers/Lists/PackedList/PackedList.C  |  24 +--
 .../containers/Lists/PackedList/PackedList.H  |   6 +-
 .../containers/Lists/PackedList/PackedListI.H | 148 +++++++++---------
 .../meshes/polyMesh/syncTools/syncTools.H     |   8 +-
 .../polyMesh/syncTools/syncToolsTemplates.C   |  14 +-
 5 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 0cf022e77b..8667ad47ba 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -28,7 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<int nBits>
+template<unsigned nBits>
 Foam::PackedList<nBits>::PackedList(const label size, const unsigned int val)
 :
     StorageList(packedLength(size), 0u),
@@ -38,7 +38,7 @@ Foam::PackedList<nBits>::PackedList(const label size, const unsigned int val)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
 :
     StorageList(packedLength(lst.size()), 0u),
@@ -76,7 +76,7 @@ Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
 #endif
 
 
-template<int nBits>
+template<unsigned nBits>
 unsigned int Foam::PackedList<nBits>::count() const
 {
     register unsigned int c = 0;
@@ -110,7 +110,7 @@ unsigned int Foam::PackedList<nBits>::count() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 bool Foam::PackedList<nBits>::trim()
 {
     if (!size_)
@@ -162,7 +162,7 @@ bool Foam::PackedList<nBits>::trim()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 Foam::labelList Foam::PackedList<nBits>::values() const
 {
     labelList elems(size());
@@ -175,10 +175,10 @@ Foam::labelList Foam::PackedList<nBits>::values() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 Foam::Ostream& Foam::PackedList<nBits>::iteratorBase::print(Ostream& os) const
 {
-    os  << "iterator<" << nBits << "> ["
+    os  << "iterator<" << label(nBits) << "> ["
         << (index_ * packing() + offset_) << "]"
         << " index:" << index_ << " offset:" << offset_
         << " value:" << unsigned(*this)
@@ -188,10 +188,10 @@ Foam::Ostream& Foam::PackedList<nBits>::iteratorBase::print(Ostream& os) const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 Foam::Ostream& Foam::PackedList<nBits>::print(Ostream& os) const
 {
-    os  << "PackedList<" << nBits << ">"
+    os  << "PackedList<" << label(nBits) << ">"
         << " max_value:" << max_value()
         << " packing:"   << packing() << nl
         << "values: " << size() << "/" << capacity() << "( ";
@@ -255,7 +255,7 @@ Foam::Ostream& Foam::PackedList<nBits>::print(Ostream& os) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<int nBits>
+template<unsigned nBits>
 void Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
 {
     setCapacity(lst.size());
@@ -263,7 +263,7 @@ void Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 void Foam::PackedList<nBits>::operator=(const UList<label>& lst)
 {
     setCapacity(lst.size());
@@ -277,7 +277,7 @@ void Foam::PackedList<nBits>::operator=(const UList<label>& lst)
 
 // * * * * * * * * * * * * * * * Ostream Operator *  * * * * * * * * * * * * //
 
-//template<int nBits>
+//template<unsigned nBits>
 //Foam::Ostream& ::Foam::operator<<(Ostream& os, const PackedList<nBits>& lst)
 //{
 //    os << lst();
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 14be22367d..b65a658e3a 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -86,9 +86,9 @@ namespace Foam
 {
 
 // Forward declaration of friend functions and operators
-template<int nBits> class PackedList;
+template<unsigned nBits> class PackedList;
 
-// template<int nBits>
+// template<unsigned nBits>
 // Ostream& operator<<(Ostream&, const PackedList<nBits>&);
 
 
@@ -102,7 +102,7 @@ TemplateName(PackedList);
                          Class PackedList Declaration
 \*---------------------------------------------------------------------------*/
 
-template <int nBits=1>
+template<unsigned nBits=1>
 class PackedList
 :
     private List<unsigned int>
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 1206e6483f..07e6d06208 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -30,42 +30,42 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::max_bits()
 {
     return sizeof(StorageType)*CHAR_BIT - 1;
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::max_value()
 {
     return (1 << nBits) - 1;
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::packing()
 {
     return sizeof(StorageType)*CHAR_BIT / nBits;
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::maskLower(unsigned offset)
 {
     return (1 << (nBits * offset)) - 1;
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::label Foam::PackedList<nBits>::packedLength(const label nElem)
 {
     return (nElem + packing() - 1) / packing();
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::checkIndex(const label i) const
 {
     if (!size_)
@@ -85,7 +85,7 @@ inline void Foam::PackedList<nBits>::checkIndex(const label i) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::PackedList()
 :
     StorageList(),
@@ -93,7 +93,7 @@ inline Foam::PackedList<nBits>::PackedList()
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::PackedList(const label size)
 :
     StorageList(packedLength(size), 0u),
@@ -101,7 +101,7 @@ inline Foam::PackedList<nBits>::PackedList(const label size)
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::PackedList(const PackedList<nBits>& lst)
 :
     StorageList(lst),
@@ -109,14 +109,14 @@ inline Foam::PackedList<nBits>::PackedList(const PackedList<nBits>& lst)
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
 {
     transfer(lst());
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::autoPtr<Foam::PackedList<nBits> >
 Foam::PackedList<nBits>::clone() const
 {
@@ -128,7 +128,7 @@ Foam::PackedList<nBits>::clone() const
 
 // iteratorBase
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::iteratorBase::iteratorBase()
 :
     list_(0),
@@ -137,7 +137,7 @@ inline Foam::PackedList<nBits>::iteratorBase::iteratorBase()
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::iteratorBase::iteratorBase
 (
     const iteratorBase& iter
@@ -149,7 +149,7 @@ inline Foam::PackedList<nBits>::iteratorBase::iteratorBase
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::iteratorBase::iteratorBase
 (
     const PackedList<nBits>* lst,
@@ -162,7 +162,7 @@ inline Foam::PackedList<nBits>::iteratorBase::iteratorBase
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int
 Foam::PackedList<nBits>::iteratorBase::get() const
 {
@@ -171,7 +171,7 @@ Foam::PackedList<nBits>::iteratorBase::get() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline bool
 Foam::PackedList<nBits>::iteratorBase::set(const unsigned int val)
 {
@@ -204,7 +204,7 @@ w            << " out-of-range 0 ... " << label(max_value())
 
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void
 Foam::PackedList<nBits>::iteratorBase::incr()
 {
@@ -217,7 +217,7 @@ Foam::PackedList<nBits>::iteratorBase::incr()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void
 Foam::PackedList<nBits>::iteratorBase::decr()
 {
@@ -230,7 +230,7 @@ Foam::PackedList<nBits>::iteratorBase::decr()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void
 Foam::PackedList<nBits>::iteratorBase::seek
 (
@@ -245,7 +245,7 @@ Foam::PackedList<nBits>::iteratorBase::seek
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline bool
 Foam::PackedList<nBits>::iteratorBase::valid() const
 {
@@ -254,7 +254,7 @@ Foam::PackedList<nBits>::iteratorBase::valid() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline bool
 Foam::PackedList<nBits>::iteratorBase::validate()
 {
@@ -276,7 +276,7 @@ Foam::PackedList<nBits>::iteratorBase::validate()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline bool Foam::PackedList<nBits>::iteratorBase::operator==
 (
     const iteratorBase& iter
@@ -286,7 +286,7 @@ inline bool Foam::PackedList<nBits>::iteratorBase::operator==
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline bool Foam::PackedList<nBits>::iteratorBase::operator!=
 (
     const iteratorBase& iter
@@ -296,7 +296,7 @@ inline bool Foam::PackedList<nBits>::iteratorBase::operator!=
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int
 Foam::PackedList<nBits>::iteratorBase::operator=(const iteratorBase& iter)
 {
@@ -306,7 +306,7 @@ Foam::PackedList<nBits>::iteratorBase::operator=(const iteratorBase& iter)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int
 Foam::PackedList<nBits>::iteratorBase::operator=(const unsigned int val)
 {
@@ -324,7 +324,7 @@ Foam::PackedList<nBits>::iteratorBase::operator=(const unsigned int val)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::iteratorBase::operator
 unsigned int () const
 {
@@ -343,21 +343,21 @@ unsigned int () const
 
 // const_iterator, iterator
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::iterator::iterator()
 :
     iteratorBase()
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::const_iterator::const_iterator()
 :
     iteratorBase()
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::iterator::iterator
 (
     const iteratorBase& iter
@@ -369,7 +369,7 @@ inline Foam::PackedList<nBits>::iterator::iterator
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::const_iterator::const_iterator
 (
     const iteratorBase& iter
@@ -381,7 +381,7 @@ inline Foam::PackedList<nBits>::const_iterator::const_iterator
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::iterator::iterator
 (
     const PackedList<nBits>* lst,
@@ -392,7 +392,7 @@ inline Foam::PackedList<nBits>::iterator::iterator
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::const_iterator::const_iterator
 (
     const PackedList<nBits>* lst,
@@ -403,7 +403,7 @@ inline Foam::PackedList<nBits>::const_iterator::const_iterator
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::PackedList<nBits>::const_iterator::const_iterator
 (
     const iterator& iter
@@ -413,7 +413,7 @@ inline Foam::PackedList<nBits>::const_iterator::const_iterator
 {}
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator&
 Foam::PackedList<nBits>::iterator::operator=(const iteratorBase& iter)
 {
@@ -422,7 +422,7 @@ Foam::PackedList<nBits>::iterator::operator=(const iteratorBase& iter)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator&
 Foam::PackedList<nBits>::const_iterator::operator=(const iteratorBase& iter)
 {
@@ -431,7 +431,7 @@ Foam::PackedList<nBits>::const_iterator::operator=(const iteratorBase& iter)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator&
 Foam::PackedList<nBits>::iterator::operator++()
 {
@@ -440,7 +440,7 @@ Foam::PackedList<nBits>::iterator::operator++()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator&
 Foam::PackedList<nBits>::const_iterator::operator++()
 {
@@ -449,7 +449,7 @@ Foam::PackedList<nBits>::const_iterator::operator++()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator
 Foam::PackedList<nBits>::iterator::operator++(int)
 {
@@ -459,7 +459,7 @@ Foam::PackedList<nBits>::iterator::operator++(int)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator
 Foam::PackedList<nBits>::const_iterator::operator++(int)
 {
@@ -469,7 +469,7 @@ Foam::PackedList<nBits>::const_iterator::operator++(int)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator&
 Foam::PackedList<nBits>::iterator::operator--()
 {
@@ -478,7 +478,7 @@ Foam::PackedList<nBits>::iterator::operator--()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator&
 Foam::PackedList<nBits>::const_iterator::operator--()
 {
@@ -487,7 +487,7 @@ Foam::PackedList<nBits>::const_iterator::operator--()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator
 Foam::PackedList<nBits>::iterator::operator--(int)
 {
@@ -497,7 +497,7 @@ Foam::PackedList<nBits>::iterator::operator--(int)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator
 Foam::PackedList<nBits>::const_iterator::operator--(int)
 {
@@ -507,7 +507,7 @@ Foam::PackedList<nBits>::const_iterator::operator--(int)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iteratorBase&
 Foam::PackedList<nBits>::iterator::operator*()
 {
@@ -515,7 +515,7 @@ Foam::PackedList<nBits>::iterator::operator*()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iteratorBase&
 Foam::PackedList<nBits>::iterator::operator()()
 {
@@ -523,7 +523,7 @@ Foam::PackedList<nBits>::iterator::operator()()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int
 Foam::PackedList<nBits>::const_iterator::operator*() const
 {
@@ -531,7 +531,7 @@ Foam::PackedList<nBits>::const_iterator::operator*() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int
 Foam::PackedList<nBits>::const_iterator::operator()() const
 {
@@ -539,7 +539,7 @@ Foam::PackedList<nBits>::const_iterator::operator()() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator
 Foam::PackedList<nBits>::begin()
 {
@@ -547,7 +547,7 @@ Foam::PackedList<nBits>::begin()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator
 Foam::PackedList<nBits>::begin() const
 {
@@ -555,7 +555,7 @@ Foam::PackedList<nBits>::begin() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator
 Foam::PackedList<nBits>::cbegin() const
 {
@@ -563,7 +563,7 @@ Foam::PackedList<nBits>::cbegin() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator
 Foam::PackedList<nBits>::end()
 {
@@ -571,7 +571,7 @@ Foam::PackedList<nBits>::end()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator
 Foam::PackedList<nBits>::end() const
 {
@@ -579,7 +579,7 @@ Foam::PackedList<nBits>::end() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::const_iterator
 Foam::PackedList<nBits>::cend() const
 {
@@ -589,21 +589,21 @@ Foam::PackedList<nBits>::cend() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::label Foam::PackedList<nBits>::size() const
 {
     return size_;
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline bool Foam::PackedList<nBits>::empty() const
 {
     return !size_;
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::resize
 (
     const label nElem,
@@ -674,7 +674,7 @@ inline void Foam::PackedList<nBits>::resize
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::setSize
 (
     const label newSize,
@@ -686,14 +686,14 @@ inline void Foam::PackedList<nBits>::setSize
 
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::label Foam::PackedList<nBits>::capacity() const
 {
     return packing() * StorageList::size();
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::setCapacity(const label nElem)
 {
     StorageList::setSize(packedLength(nElem), 0u);
@@ -706,7 +706,7 @@ inline void Foam::PackedList<nBits>::setCapacity(const label nElem)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::reserve
 (
     const label nElem
@@ -722,14 +722,14 @@ inline void Foam::PackedList<nBits>::reserve
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::clear()
 {
     size_ = 0;
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::clearStorage()
 {
     StorageList::clear();
@@ -737,7 +737,7 @@ inline void Foam::PackedList<nBits>::clearStorage()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::shrink()
 {
     label len = packedLength(size_);
@@ -749,7 +749,7 @@ inline void Foam::PackedList<nBits>::shrink()
     }
 }
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::List<unsigned int>&
 Foam::PackedList<nBits>::storage()
 {
@@ -757,7 +757,7 @@ Foam::PackedList<nBits>::storage()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline const Foam::List<unsigned int>&
 Foam::PackedList<nBits>::storage() const
 {
@@ -765,7 +765,7 @@ Foam::PackedList<nBits>::storage() const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::transfer(PackedList<nBits>& lst)
 {
     size_ = lst.size_;
@@ -775,7 +775,7 @@ inline void Foam::PackedList<nBits>::transfer(PackedList<nBits>& lst)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline Foam::Xfer< Foam::PackedList<nBits> >
 Foam::PackedList<nBits>::xfer()
 {
@@ -783,7 +783,7 @@ Foam::PackedList<nBits>::xfer()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::get(const label i) const
 {
 #   ifdef DEBUGList
@@ -794,7 +794,7 @@ inline unsigned int Foam::PackedList<nBits>::get(const label i) const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::operator[](const label i) const
 {
     if (i < size_)
@@ -808,7 +808,7 @@ inline unsigned int Foam::PackedList<nBits>::operator[](const label i) const
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline bool Foam::PackedList<nBits>::set
 (
     const label i,
@@ -831,7 +831,7 @@ inline bool Foam::PackedList<nBits>::set
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::append(const unsigned int val)
 {
     label elemI = size_;
@@ -842,7 +842,7 @@ inline void Foam::PackedList<nBits>::append(const unsigned int val)
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::remove()
 {
     if (!size_)
@@ -861,7 +861,7 @@ inline unsigned int Foam::PackedList<nBits>::remove()
 }
 
 
-template<int nBits>
+template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iteratorBase
 Foam::PackedList<nBits>::operator[](const label i)
 {
@@ -870,7 +870,7 @@ Foam::PackedList<nBits>::operator[](const label i)
 
 
 // specialization for nBits=1 isn't worth the bother
-template<int nBits>
+template<unsigned nBits>
 inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
 {
     if (val)
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index 8841fe9870..754eaf907c 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
@@ -223,7 +223,7 @@ public:
 
         // PackedList versions
 
-            template <int nBits, class CombineOp>
+            template <unsigned nBits, class CombineOp>
             static void syncFaceList
             (
                 const polyMesh& mesh,
@@ -231,14 +231,14 @@ public:
                 const CombineOp& cop
             );
 
-            template <int nBits>
+            template <unsigned nBits>
             static void swapFaceList
             (
                 const polyMesh& mesh,
                 PackedList<nBits>& faceValues
             );
 
-            template <int nBits, class CombineOp>
+            template <unsigned nBits, class CombineOp>
             static void syncPointList
             (
                 const polyMesh& mesh,
@@ -247,7 +247,7 @@ public:
                 const unsigned int nullValue
             );
 
-            template <int nBits, class CombineOp>
+            template <unsigned nBits, class CombineOp>
             static void syncEdgeList
             (
                 const polyMesh& mesh,
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index acca055b61..da198638a2 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -1570,7 +1570,7 @@ void Foam::syncTools::swapFaceList
 }
 
 
-template <int nBits, class CombineOp>
+template <unsigned nBits, class CombineOp>
 void Foam::syncTools::syncFaceList
 (
     const polyMesh& mesh,
@@ -1582,7 +1582,7 @@ void Foam::syncTools::syncFaceList
     {
         FatalErrorIn
         (
-            "syncTools<int nBits, class CombineOp>::syncFaceList"
+            "syncTools<unsigned nBits, class CombineOp>::syncFaceList"
             "(const polyMesh&, PackedList<nBits>&, const CombineOp&)"
         )   << "Number of values " << faceValues.size()
             << " is not equal to the number of faces in the mesh "
@@ -1691,7 +1691,7 @@ void Foam::syncTools::syncFaceList
 }
 
 
-template <int nBits>
+template <unsigned nBits>
 void Foam::syncTools::swapFaceList
 (
     const polyMesh& mesh,
@@ -1702,7 +1702,7 @@ void Foam::syncTools::swapFaceList
 }
 
 
-template <int nBits, class CombineOp>
+template <unsigned nBits, class CombineOp>
 void Foam::syncTools::syncPointList
 (
     const polyMesh& mesh,
@@ -1715,7 +1715,7 @@ void Foam::syncTools::syncPointList
     {
         FatalErrorIn
         (
-            "syncTools<int nBits, class CombineOp>::syncPointList"
+            "syncTools<unsigned nBits, class CombineOp>::syncPointList"
             "(const polyMesh&, PackedList<nBits>&, const CombineOp&"
             ", const unsigned int&)"
         )   << "Number of values " << pointValues.size()
@@ -1870,7 +1870,7 @@ void Foam::syncTools::syncPointList
 }
 
 
-template <int nBits, class CombineOp>
+template <unsigned nBits, class CombineOp>
 void Foam::syncTools::syncEdgeList
 (
     const polyMesh& mesh,
@@ -1883,7 +1883,7 @@ void Foam::syncTools::syncEdgeList
     {
         FatalErrorIn
         (
-            "syncTools<int nBits, class CombineOp>::syncEdgeList"
+            "syncTools<unsigned nBits, class CombineOp>::syncEdgeList"
             "(const polyMesh&, PackedList<nBits>&, const CombineOp&"
             ", const unsigned int&)"
         )   << "Number of values " << edgeValues.size()