From 0db8ff34fd8683f02aa5a7b5cdc45500b4e6f1e7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 28 Feb 2016 18:21:58 +0000
Subject: [PATCH] src/OpenFOAM/containers: Updated formatting and comments
---
.../Dictionaries/Dictionary/Dictionary.H | 4 +-
.../DictionaryBase/DictionaryBase.C | 10 +--
.../DictionaryBase/DictionaryBase.H | 4 +-
.../PtrDictionary/PtrDictionary.H | 4 +-
.../PtrListDictionary/PtrListDictionary.H | 4 +-
.../Dictionaries/UDictionary/UDictionary.H | 4 +-
.../UPtrDictionary/UPtrDictionary.H | 4 +-
.../HashTables/HashPtrTable/HashPtrTable.C | 4 +-
.../HashTables/HashPtrTable/HashPtrTable.H | 4 +-
.../containers/HashTables/HashSet/HashSet.C | 3 +-
.../containers/HashTables/HashSet/HashSet.H | 2 +-
.../HashTables/HashTable/HashTable.C | 10 +--
.../HashTables/HashTable/HashTable.H | 4 +-
.../StaticHashTable/StaticHashTable.H | 4 +-
.../StaticHashTable/StaticHashTableI.H | 8 +-
.../LinkedLists/accessTypes/ILList/ILList.H | 4 +-
.../LinkedLists/accessTypes/LList/LList.H | 4 +-
.../accessTypes/LPtrList/LPtrList.H | 4 +-
.../LinkedLists/accessTypes/UILList/UILList.C | 3 +-
.../LinkedLists/accessTypes/UILList/UILList.H | 4 +-
src/OpenFOAM/containers/Lists/BinSum/BinSum.H | 4 +-
.../Lists/CompactListList/CompactListList.H | 4 +-
.../Lists/Distribution/Distribution.H | 2 +-
.../Lists/DynamicList/DynamicList.H | 2 +-
.../Lists/DynamicList/DynamicListI.H | 86 ++++++++++---------
.../containers/Lists/FixedList/FixedList.H | 2 +-
.../containers/Lists/FixedList/FixedListI.H | 26 +++---
.../containers/Lists/Histogram/Histogram.H | 6 +-
src/OpenFOAM/containers/Lists/List/List.H | 4 +-
.../Lists/ListListOps/ListListOps.H | 4 +-
.../containers/Lists/ListOps/ListOps.H | 4 +-
.../Lists/ListOps/ListOpsTemplates.C | 4 +-
.../containers/Lists/PackedList/PackedList.C | 6 +-
.../containers/Lists/PackedList/PackedList.H | 2 +-
.../containers/Lists/PackedList/PackedListI.H | 58 ++++++-------
.../containers/Lists/PtrList/PtrList.H | 4 +-
.../Lists/SortableList/ParSortableList.C | 6 +-
.../Lists/SortableList/ParSortableList.H | 4 +-
.../Lists/SortableList/SortableList.H | 2 +-
.../containers/Lists/SubList/SubListI.H | 8 +-
.../Lists/UIndirectList/UIndirectList.H | 4 +-
src/OpenFOAM/containers/Lists/UList/UList.H | 6 +-
src/OpenFOAM/containers/Lists/UList/UListI.H | 18 ++--
.../containers/Lists/UPtrList/UPtrList.H | 4 +-
src/OpenFOAM/containers/NamedEnum/NamedEnum.H | 4 +-
45 files changed, 165 insertions(+), 201 deletions(-)
diff --git a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
index 85901731f22..98be8b170c3 100644
--- a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,7 +83,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "Dictionary.C"
+ #include "Dictionary.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
index 8ddb9e062d4..9693eb9488b 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -88,7 +88,6 @@ Foam::DictionaryBase<IDLListType, T>::DictionaryBase(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Find and return T
template<class IDLListType, class T>
bool Foam::DictionaryBase<IDLListType, T>::found(const word& keyword) const
{
@@ -96,7 +95,6 @@ bool Foam::DictionaryBase<IDLListType, T>::found(const word& keyword) const
}
-// Find and return T*, return NULL if not found
template<class IDLListType, class T>
const T* Foam::DictionaryBase<IDLListType, T>::lookupPtr
(
@@ -116,7 +114,6 @@ const T* Foam::DictionaryBase<IDLListType, T>::lookupPtr
}
-// Find and return T*, return NULL if not found
template<class IDLListType, class T>
T* Foam::DictionaryBase<IDLListType, T>::lookupPtr(const word& keyword)
{
@@ -133,7 +130,6 @@ T* Foam::DictionaryBase<IDLListType, T>::lookupPtr(const word& keyword)
}
-// Find and return T*, FatalError if keyword not found
template<class IDLListType, class T>
const T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword) const
{
@@ -150,7 +146,6 @@ const T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword) const
}
-// Find and return T*, FatalError if keyword not found
template<class IDLListType, class T>
T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword)
{
@@ -167,7 +162,6 @@ T* Foam::DictionaryBase<IDLListType, T>::lookup(const word& keyword)
}
-// Return the table of contents
template<class IDLListType, class T>
Foam::wordList Foam::DictionaryBase<IDLListType, T>::toc() const
{
@@ -188,7 +182,6 @@ Foam::wordList Foam::DictionaryBase<IDLListType, T>::toc() const
}
-// Add at head of dictionary
template<class IDLListType, class T>
void Foam::DictionaryBase<IDLListType, T>::insert(const word& keyword, T* tPtr)
{
@@ -198,7 +191,6 @@ void Foam::DictionaryBase<IDLListType, T>::insert(const word& keyword, T* tPtr)
}
-// Add at tail of dictionary
template<class IDLListType, class T>
void Foam::DictionaryBase<IDLListType, T>::append(const word& keyword, T* tPtr)
{
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
index f9294eedd03..9b85e015944 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -183,7 +183,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "DictionaryBase.C"
+ #include "DictionaryBase.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
index a287e326cb6..974a9678906 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -97,7 +97,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "PtrDictionary.C"
+ #include "PtrDictionary.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H
index 761bccd76e3..ab45e2c4919 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -111,7 +111,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "PtrListDictionary.C"
+ #include "PtrListDictionary.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/UDictionary/UDictionary.H b/src/OpenFOAM/containers/Dictionaries/UDictionary/UDictionary.H
index efe4542b0c9..b01140d2838 100644
--- a/src/OpenFOAM/containers/Dictionaries/UDictionary/UDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/UDictionary/UDictionary.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -76,7 +76,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "UDictionary.C"
+ #include "UDictionary.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
index f83825a3274..6be6c44a651 100644
--- a/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/UPtrDictionary/UPtrDictionary.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -76,7 +76,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "UPtrDictionary.C"
+ #include "UPtrDictionary.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
index 4f6ad375ab9..df115134ef3 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,7 +28,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct given initial table size
template<class T, class Key, class Hash>
Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const label size)
:
@@ -36,7 +35,6 @@ Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const label size)
{}
-// Construct as copy
template<class T, class Key, class Hash>
Foam::HashPtrTable<T, Key, Hash>::HashPtrTable
(
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 783e5799891..796076fe22a 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -153,7 +153,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "HashPtrTable.C"
+ #include "HashPtrTable.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
index 814fcdcc8cd..08dc33d3cfc 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -166,7 +166,6 @@ void Foam::HashSet<Key, Hash>::operator^=(const HashSet<Key, Hash>& rhs)
}
-// same as HashTable::erase()
template<class Key, class Hash>
void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
{
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 513efd8c9bf..bbc04789bde 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -218,7 +218,7 @@ typedef HashSet<label, Hash<label>> labelHashSet;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "HashSet.C"
+ #include "HashSet.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index a76846247d2..9755dc56c1c 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -363,15 +363,13 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
}
-
-// NOTE:
-// We use (const iterator&) here, but manipulate its contents anyhow.
-// The parameter should be (iterator&), but then the compiler doesn't find
-// it correctly and tries to call as (iterator) instead.
-//
template<class T, class Key, class Hash>
bool Foam::HashTable<T, Key, Hash>::erase(const iterator& iter)
{
+ // NOTE: We use (const iterator&) here, but manipulate its contents anyhow.
+ // The parameter should be (iterator&), but then the compiler doesn't find
+ // it correctly and tries to call as (iterator) instead.
+ //
// Adjust iterator after erase
return const_cast<iterator&>(iter).erase();
}
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index b24990f5c13..f2137687385 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -546,13 +546,13 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "HashTableI.H"
+ #include "HashTableI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifndef NoHashTableC
#ifdef NoRepository
-# include "HashTable.C"
+ #include "HashTable.C"
#endif
#endif
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
index d10ae72bb41..67dfdfa5a92 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
@@ -397,13 +397,13 @@ private:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "StaticHashTableI.H"
+ #include "StaticHashTableI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifndef NoStaticHashTableC
#ifdef NoRepository
-# include "StaticHashTable.C"
+ #include "StaticHashTable.C"
#endif
#endif
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index 50030eae948..cebb3852aa5 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -345,12 +345,12 @@ Foam::StaticHashTable<T, Key, Hash>::begin()
}
}
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
if (debug)
{
Info<< "StaticHashTable is empty\n";
}
-# endif
+ #endif
return StaticHashTable<T, Key, Hash>::endIter_;
}
@@ -377,12 +377,12 @@ Foam::StaticHashTable<T, Key, Hash>::cbegin() const
}
}
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
if (debug)
{
Info<< "StaticHashTable is empty\n";
}
-# endif
+ #endif
return StaticHashTable<T, Key, Hash>::endConstIter_;
}
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
index 893095d15bc..3a25cfad7a7 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -147,7 +147,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "ILList.C"
+ #include "ILList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index e8a9ff22d4d..fd1c3e0aef5 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -368,7 +368,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "LList.C"
+ #include "LList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
index 0ef461ccde9..e2b7e49a5aa 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -270,7 +270,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "LPtrList.C"
+ #include "LPtrList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
index 9afa118da04..0a7f0572862 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -76,7 +76,6 @@ bool Foam::UILList<LListBase, T>::operator==
}
-// Comparison for inequality
template<class LListBase, class T>
bool Foam::UILList<LListBase, T>::operator!=
(
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
index b2ec4c8fca4..28d1231762f 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -380,7 +380,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "UILList.C"
+ #include "UILList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/BinSum/BinSum.H b/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
index 3cf09bc3a77..dc7d72c4cb6 100644
--- a/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
+++ b/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -139,7 +139,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "BinSum.C"
+ #include "BinSum.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 91c6b98feca..d5764ba08de 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -254,12 +254,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "CompactListListI.H"
+ #include "CompactListListI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "CompactListList.C"
+ #include "CompactListList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
index 89e9eb5cd40..5ef5d4de3a2 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
@@ -197,7 +197,7 @@ Distribution<Type> operator+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "Distribution.C"
+ #include "Distribution.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index e4a0b142534..893804bb322 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -254,7 +254,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "DynamicList.C"
+ #include "DynamicList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 802cf9b17ab..d62f00006c1 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -44,7 +44,7 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
List<T>(nElem),
capacity_(nElem)
{
- // we could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
+ // We could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
List<T>::size(0);
}
@@ -115,10 +115,11 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setCapacity
if (nextFree > capacity_)
{
- // truncate addressed sizes too
+ // Truncate addressed sizes too
nextFree = capacity_;
}
- // we could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
+
+ // We could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
List<T>::setSize(capacity_);
List<T>::size(nextFree);
@@ -131,21 +132,21 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::reserve
const label nElem
)
{
- // allocate more capacity?
+ // Allocate more capacity?
if (nElem > capacity_)
{
-// TODO: convince the compiler that division by zero does not occur
-// if (SizeInc && (!SizeMult || !SizeDiv))
-// {
-// // resize with SizeInc as the granularity
-// capacity_ = nElem;
-// unsigned pad = SizeInc - (capacity_ % SizeInc);
-// if (pad != SizeInc)
-// {
-// capacity_ += pad;
-// }
-// }
-// else
+ // TODO: convince the compiler that division by zero does not occur
+ // if (SizeInc && (!SizeMult || !SizeDiv))
+ // {
+ // // resize with SizeInc as the granularity
+ // capacity_ = nElem;
+ // unsigned pad = SizeInc - (capacity_ % SizeInc);
+ // if (pad != SizeInc)
+ // {
+ // capacity_ += pad;
+ // }
+ // }
+ // else
{
capacity_ = max
(
@@ -154,7 +155,7 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::reserve
);
}
- // adjust allocated size, leave addressed size untouched
+ // Adjust allocated size, leave addressed size untouched
label nextFree = List<T>::size();
List<T>::setSize(capacity_);
List<T>::size(nextFree);
@@ -168,21 +169,21 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
const label nElem
)
{
- // allocate more capacity?
+ // Allocate more capacity?
if (nElem > capacity_)
{
-// TODO: convince the compiler that division by zero does not occur
-// if (SizeInc && (!SizeMult || !SizeDiv))
-// {
-// // resize with SizeInc as the granularity
-// capacity_ = nElem;
-// unsigned pad = SizeInc - (capacity_ % SizeInc);
-// if (pad != SizeInc)
-// {
-// capacity_ += pad;
-// }
-// }
-// else
+ // TODO: convince the compiler that division by zero does not occur
+ // if (SizeInc && (!SizeMult || !SizeDiv))
+ // {
+ // // resize with SizeInc as the granularity
+ // capacity_ = nElem;
+ // unsigned pad = SizeInc - (capacity_ % SizeInc);
+ // if (pad != SizeInc)
+ // {
+ // capacity_ += pad;
+ // }
+ // }
+ // else
{
capacity_ = max
(
@@ -194,7 +195,7 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
List<T>::setSize(capacity_);
}
- // adjust addressed size
+ // Adjust addressed size
List<T>::size(nElem);
}
@@ -209,7 +210,7 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
label nextFree = List<T>::size();
setSize(nElem);
- // set new elements to constant value
+ // Set new elements to constant value
while (nextFree < nElem)
{
this->operator[](nextFree++) = t;
@@ -260,10 +261,10 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::shrink()
label nextFree = List<T>::size();
if (capacity_ > nextFree)
{
- // use the full list when resizing
+ // Use the full list when resizing
List<T>::size(capacity_);
- // the new size
+ // The new size
capacity_ = nextFree;
List<T>::setSize(capacity_);
List<T>::size(nextFree);
@@ -277,7 +278,7 @@ inline void
Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::transfer(List<T>& lst)
{
capacity_ = lst.size();
- List<T>::transfer(lst); // take over storage, clear addressing for lst.
+ List<T>::transfer(lst); // Take over storage, clear addressing for lst.
}
@@ -288,7 +289,7 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::transfer
DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
)
{
- // take over storage as-is (without shrink), clear addressing for lst.
+ // Take over storage as-is (without shrink), clear addressing for lst.
capacity_ = lst.capacity_;
lst.capacity_ = 0;
@@ -421,13 +422,13 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
if (capacity_ >= lst.size())
{
- // can copy w/o reallocating, match initial size to avoid reallocation
+ // Can copy w/o reallocating, match initial size to avoid reallocation
List<T>::size(lst.size());
List<T>::operator=(lst);
}
else
{
- // make everything available for the copy operation
+ // Make everything available for the copy operation
List<T>::size(capacity_);
List<T>::operator=(lst);
@@ -444,13 +445,13 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
{
if (capacity_ >= lst.size())
{
- // can copy w/o reallocating, match initial size to avoid reallocation
+ // Can copy w/o reallocating, match initial size to avoid reallocation
List<T>::size(lst.size());
List<T>::operator=(lst);
}
else
{
- // make everything available for the copy operation
+ // Make everything available for the copy operation
List<T>::size(capacity_);
List<T>::operator=(lst);
@@ -467,13 +468,13 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
{
if (capacity_ >= lst.size())
{
- // can copy w/o reallocating, match initial size to avoid reallocation
+ // Can copy w/o reallocating, match initial size to avoid reallocation
List<T>::size(lst.size());
List<T>::operator=(lst);
}
else
{
- // make everything available for the copy operation
+ // Make everything available for the copy operation
List<T>::size(capacity_);
List<T>::operator=(lst);
@@ -481,4 +482,5 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
}
}
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index ed0fbc12b2d..c7974940c5b 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -365,7 +365,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "FixedList.C"
+ #include "FixedList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index a6470695997..0b0daf1d711 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -125,7 +125,6 @@ inline Foam::label Foam::FixedList<T, Size>::rcIndex(const label i) const
}
-// Check start is within valid range (0 ... size-1).
template<class T, unsigned Size>
inline void Foam::FixedList<T, Size>::checkStart(const label start) const
{
@@ -138,7 +137,6 @@ inline void Foam::FixedList<T, Size>::checkStart(const label start) const
}
-// Check size is within valid range (0 ... size).
template<class T, unsigned Size>
inline void Foam::FixedList<T, Size>::checkSize(const label size) const
{
@@ -151,8 +149,6 @@ inline void Foam::FixedList<T, Size>::checkSize(const label size) const
}
-// Check index i is within valid range (0 ... size-1)
-// The check for zero-sized list is already done in static assert
template<class T, unsigned Size>
inline void Foam::FixedList<T, Size>::checkIndex(const label i) const
{
@@ -168,17 +164,17 @@ inline void Foam::FixedList<T, Size>::checkIndex(const label i) const
template<class T, unsigned Size>
inline void Foam::FixedList<T, Size>::resize(const label s)
{
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
checkSize(s);
-# endif
+ #endif
}
template<class T, unsigned Size>
inline void Foam::FixedList<T, Size>::setSize(const label s)
{
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
checkSize(s);
-# endif
+ #endif
}
template<class T, unsigned Size>
@@ -237,24 +233,22 @@ inline const T& Foam::FixedList<T, Size>::last() const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-// element access
template<class T, unsigned Size>
inline T& Foam::FixedList<T, Size>::operator[](const label i)
{
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
checkIndex(i);
-# endif
+ #endif
return v_[i];
}
-// const element access
template<class T, unsigned Size>
inline const T& Foam::FixedList<T, Size>::operator[](const label i) const
{
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
checkIndex(i);
-# endif
+ #endif
return v_[i];
}
@@ -435,12 +429,12 @@ inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
{
if (contiguous<T>())
{
- // hash directly
+ // Hash directly
return Hasher(lst.v_, sizeof(lst.v_), seed);
}
else
{
- // hash incrementally
+ // Hash incrementally
unsigned val = seed;
for (unsigned i=0; i<Size; i++)
diff --git a/src/OpenFOAM/containers/Lists/Histogram/Histogram.H b/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
index 7cdf6ebda35..5b4b5a9b222 100644
--- a/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
+++ b/src/OpenFOAM/containers/Lists/Histogram/Histogram.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -120,12 +120,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//# include "HistogramI.H"
+// #include "HistogramI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "Histogram.C"
+ #include "Histogram.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 4f8859e32c8..d86ea022511 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -251,12 +251,12 @@ List<T> readList(Istream&);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "ListI.H"
+ #include "ListI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "List.C"
+ #include "List.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
index 02afe8abf33..ab9dfd4e499 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -150,7 +150,7 @@ namespace ListListOps
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "ListListOps.C"
+ #include "ListListOps.C"
#endif
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index c322c7856fa..82be15ee5a3 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -291,7 +291,7 @@ void inplaceRotateList(ListType<DataType>& list, label n);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "ListOpsTemplates.C"
+ #include "ListOpsTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 7421eabbce3..7194a89eb77 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -411,8 +411,6 @@ void Foam::inplaceSubset
}
-// As clarification:
-// coded as inversion from pointEdges to edges but completely general.
template<class InList, class OutList>
void Foam::invertManyToMany
(
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 576471c9a9a..5e0487ebcdd 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -31,7 +31,7 @@ License
#if (UINT_MAX == 0xFFFFFFFF)
// 32-bit counting, Hamming weight method
-# define COUNT_PACKEDBITS(sum, x) \
+ #define COUNT_PACKEDBITS(sum, x) \
{ \
x -= (x >> 1) & 0x55555555; \
x = (x & 0x33333333) + ((x >> 2) & 0x33333333); \
@@ -39,7 +39,7 @@ License
}
#elif (UINT_MAX == 0xFFFFFFFFFFFFFFFF)
// 64-bit counting, Hamming weight method
-# define COUNT_PACKEDBITS(sum, x) \
+ #define COUNT_PACKEDBITS(sum, x) \
{ \
x -= (x >> 1) & 0x5555555555555555; \
x = (x & 0x3333333333333333) + ((x >> 2) & 0x3333333333333333); \
@@ -47,7 +47,7 @@ License
}
#else
// Arbitrary number of bits, Brian Kernighan's method
-# define COUNT_PACKEDBITS(sum, x) for (; x; ++sum) { x &= x - 1; }
+ #define COUNT_PACKEDBITS(sum, x) for (; x; ++sum) { x &= x - 1; }
#endif
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 7f038c159bc..078a4dde9f4 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -639,7 +639,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "PackedList.C"
+ #include "PackedList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 4b6898cf5e6..69d68a8b328 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -52,7 +52,7 @@ inline unsigned int Foam::PackedList<nBits>::packing()
template<unsigned nBits>
inline unsigned int Foam::PackedList<nBits>::maskLower(unsigned offset)
{
- // return (1u << (nBits * offset)) - 1;
+ // Return (1u << (nBits * offset)) - 1;
// The next one works more reliably with overflows
// eg, when compiled without optimization
return (~0u >> ( sizeof(StorageType)*CHAR_BIT - nBits * offset));
@@ -266,8 +266,6 @@ Foam::PackedList<nBits>::clone() const
// * * * * * * * * * * * * * * * * Iterators * * * * * * * * * * * * * * * * //
-// iteratorBase
-
template<unsigned nBits>
inline Foam::PackedList<nBits>::iteratorBase::iteratorBase()
:
@@ -315,7 +313,7 @@ Foam::PackedList<nBits>::iteratorBase::set(const unsigned int val)
if (val >= max_value())
{
- // overflow is max_value, fill everything
+ // Overflow is max_value, fill everything
stored |= mask;
}
else
@@ -372,7 +370,7 @@ inline void Foam::PackedList<nBits>::iteratorBase::operator=
const unsigned int val
)
{
- // lazy evaluation - increase size on assigment
+ // Lazy evaluation - increase size on assigment
if (index_ >= list_->size_)
{
list_->resize(index_ + 1);
@@ -386,7 +384,7 @@ template<unsigned nBits>
inline Foam::PackedList<nBits>::iteratorBase::operator
unsigned int () const
{
- // lazy evaluation - return 0 for out-of-range
+ // Lazy evaluation - return 0 for out-of-range
if (index_ >= list_->size_)
{
return 0;
@@ -396,8 +394,6 @@ unsigned int () const
}
-// const_iterator, iterator
-
template<unsigned nBits>
inline Foam::PackedList<nBits>::iterator::iterator()
:
@@ -420,7 +416,7 @@ inline Foam::PackedList<nBits>::iterator::iterator
:
iteratorBase(iter)
{
- // avoid going past end()
+ // Avoid going past end()
// eg, iter = iterator(list, Inf)
if (this->index_ > this->list_->size_)
{
@@ -437,7 +433,7 @@ inline Foam::PackedList<nBits>::const_iterator::const_iterator
:
iteratorBase(iter)
{
- // avoid going past end()
+ // Avoid going past end()
// eg, iter = iterator(list, Inf)
if (this->index_ > this->list_->size_)
{
@@ -527,7 +523,7 @@ inline void Foam::PackedList<nBits>::iterator::operator=
this->list_ = iter.list_;
this->index_ = iter.index_;
- // avoid going past end()
+ // Avoid going past end()
// eg, iter = iterator(list, Inf)
if (this->index_ > this->list_->size_)
{
@@ -545,7 +541,7 @@ inline void Foam::PackedList<nBits>::const_iterator::operator=
this->list_ = iter.list_;
this->index_ = iter.index_;
- // avoid going past end()
+ // Avoid going past end()
// eg, iter = iterator(list, Inf)
if (this->index_ > this->list_->size_)
{
@@ -742,15 +738,15 @@ inline void Foam::PackedList<nBits>::resize
if (size_ > oldSize)
{
- // fill new elements or newly exposed elements
+ // Fill new elements or newly exposed elements
if (val)
{
- // fill value for complete segments
+ // Fill value for complete segments
unsigned int fill = val;
if (val >= max_value())
{
- // fill everything
+ // Fill everything
fill = maskLower(packing());
}
else
@@ -761,7 +757,7 @@ inline void Foam::PackedList<nBits>::resize
}
}
- // fill in complete segments
+ // Fill in complete segments
const label oldLen = packedLength(oldSize);
const label newLen = packedLength(size_);
for (label i=oldLen; i < newLen; ++i)
@@ -769,7 +765,7 @@ inline void Foam::PackedList<nBits>::resize
StorageList::operator[](i) = fill;
}
- // finish previous partial segment, preserve existing value
+ // Finish previous partial segment, preserve existing value
{
const unsigned int off = oldSize % packing();
if (off)
@@ -783,7 +779,7 @@ inline void Foam::PackedList<nBits>::resize
}
- // mask off the (new) final partial segment
+ // Mask off the (new) final partial segment
{
const unsigned int off = size_ % packing();
if (off)
@@ -797,10 +793,10 @@ inline void Foam::PackedList<nBits>::resize
}
else if (size_ < oldSize)
{
- // resize shrinking
+ // Resize shrinking
// - clear newly exposed elements
- // fill in complete segments
+ // Fill in complete segments
const label oldLen = packedLength(oldSize);
const label newLen = packedLength(size_);
for (label i=newLen; i < oldLen; ++i)
@@ -808,7 +804,7 @@ inline void Foam::PackedList<nBits>::resize
StorageList::operator[](i) = 0u;
}
- // mask off the final partial segment
+ // Mask off the final partial segment
{
const unsigned int off = size_ % packing();
if (off)
@@ -846,12 +842,12 @@ inline void Foam::PackedList<nBits>::setCapacity(const label nElem)
{
StorageList::setSize(packedLength(nElem), 0u);
- // truncate addressed size too
+ // Truncate addressed size too
if (size_ > nElem)
{
size_ = nElem;
- // mask off the final partial segment
+ // Mask off the final partial segment
const unsigned int off = size_ % packing();
if (off)
{
@@ -868,7 +864,7 @@ inline void Foam::PackedList<nBits>::reserve(const label nElem)
{
const label len = packedLength(nElem);
- // need more capacity?
+ // Need more capacity?
if (len > StorageList::size())
{
// Like DynamicList with SizeInc=0, SizeMult=2, SizeDiv=1
@@ -911,7 +907,7 @@ inline void Foam::PackedList<nBits>::clearStorage()
template<unsigned nBits>
inline void Foam::PackedList<nBits>::shrink()
{
- // any uneed space allocated?
+ // Any uneed space allocated?
const label len = packedLength();
if (len < StorageList::size())
{
@@ -967,7 +963,7 @@ inline Foam::Xfer<Foam::PackedList<nBits>> Foam::PackedList<nBits>::xfer()
template<unsigned nBits>
inline unsigned int Foam::PackedList<nBits>::get(const label i) const
{
- // lazy evaluation - return 0 for out-of-range
+ // Lazy evaluation - return 0 for out-of-range
if (i < 0 || i >= size_)
{
return 0;
@@ -982,7 +978,7 @@ inline unsigned int Foam::PackedList<nBits>::get(const label i) const
template<unsigned nBits>
inline unsigned int Foam::PackedList<nBits>::operator[](const label i) const
{
- // lazy evaluation - return 0 for out-of-range
+ // Lazy evaluation - return 0 for out-of-range
if (i < 0 || i >= size_)
{
return 0;
@@ -1003,12 +999,12 @@ inline bool Foam::PackedList<nBits>::set
{
if (i < 0)
{
- // lazy evaluation - ignore out-of-bounds
+ // Lazy evaluation - ignore out-of-bounds
return false;
}
else if (i >= size_)
{
- // lazy evaluation - increase size on assigment
+ // Lazy evaluation - increase size on assigment
resize(i + 1);
}
@@ -1080,7 +1076,7 @@ inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
if (val >= max_value())
{
- // fill everything
+ // Fill everything
fill = maskLower(packing());
}
else
@@ -1096,7 +1092,7 @@ inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
StorageList::operator[](i) = fill;
}
- // mask off the final partial segment
+ // Mask off the final partial segment
{
const unsigned int off = size_ % packing();
if (off)
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index d412270b135..2b5e5584d6c 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -432,12 +432,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "PtrListI.H"
+ #include "PtrListI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "PtrList.C"
+ #include "PtrList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
index ef9e71ffc20..67de1b2dc04 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -48,7 +48,6 @@ void Foam::ParSortableList<Type>::write
}
-// Copy src, starting at destI into dest.
template<class Type>
void Foam::ParSortableList<Type>::copyInto
(
@@ -122,7 +121,6 @@ void Foam::ParSortableList<Type>::checkAndSend
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from List, sorting the elements
template<class Type>
Foam::ParSortableList<Type>::ParSortableList(const UList<Type>& values)
:
@@ -134,7 +132,6 @@ Foam::ParSortableList<Type>::ParSortableList(const UList<Type>& values)
}
-// Construct given size. Sort later on.
template<class Type>
Foam::ParSortableList<Type>::ParSortableList(const label size)
:
@@ -146,7 +143,6 @@ Foam::ParSortableList<Type>::ParSortableList(const label size)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Sort
template<class Type>
void Foam::ParSortableList<Type>::sort()
{
diff --git a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
index c528d94d86b..9d7bdf71c49 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -204,7 +204,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "ParSortableList.C"
+ #include "ParSortableList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index 56fa2e20c1b..1eb4fe782c1 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
@@ -137,7 +137,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "SortableList.C"
+ #include "SortableList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index a0b9f328073..90b6ce6d288 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -34,9 +34,9 @@ inline Foam::SubList<T>::SubList
:
UList<T>(list.v_, subSize)
{
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
list.checkSize(subSize);
-# endif
+ #endif
}
@@ -50,7 +50,7 @@ inline Foam::SubList<T>::SubList
:
UList<T>(&(list.v_[startIndex]), subSize)
{
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
// Artificially allow the start of a zero-sized subList to be
// one past the end of the original list.
@@ -65,7 +65,7 @@ inline Foam::SubList<T>::SubList
// behind the last element is allowed
list.checkSize(startIndex);
}
-# endif
+ #endif
}
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index 4409dac8c05..bb3b9e3a9ad 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -165,7 +165,7 @@ public:
#include "UIndirectListI.H"
#ifdef NoRepository
-# include "UIndirectListIO.C"
+ #include "UIndirectListIO.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 1bb858d7969..aff5ff8e121 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -391,7 +391,7 @@ inline void reverse(UList<T>&);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "UListI.H"
+ #include "UListI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -459,7 +459,7 @@ inline void reverse(UList<T>&);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "UList.C"
+ #include "UList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index 523abb2d29d..243e5faaf1d 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -68,7 +68,6 @@ inline Foam::label Foam::UList<T>::rcIndex(const label i) const
}
-// Check start is within valid range (0 ... size-1).
template<class T>
inline void Foam::UList<T>::checkStart(const label start) const
{
@@ -81,7 +80,6 @@ inline void Foam::UList<T>::checkStart(const label start) const
}
-// Check size is within valid range (0 ... size).
template<class T>
inline void Foam::UList<T>::checkSize(const label size) const
{
@@ -94,7 +92,6 @@ inline void Foam::UList<T>::checkSize(const label size) const
}
-// Check index i is within valid range (0 ... size-1).
template<class T>
inline void Foam::UList<T>::checkIndex(const label i) const
{
@@ -158,20 +155,18 @@ inline T* Foam::UList<T>::data()
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-// element access
template<class T>
inline T& Foam::UList<T>::operator[](const label i)
{
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
checkIndex(i);
-# endif
+ #endif
return v_[i];
}
namespace Foam
{
-
// Template specialization for bool
template<>
inline const bool& Foam::UList<bool>::operator[](const label i) const
@@ -186,22 +181,19 @@ namespace Foam
return Foam::pTraits<bool>::zero;
}
}
-
-} // end of namespace Foam
+}
-// const element access
template<class T>
inline const T& Foam::UList<T>::operator[](const label i) const
{
-# ifdef FULLDEBUG
+ #ifdef FULLDEBUG
checkIndex(i);
-# endif
+ #endif
return v_[i];
}
-// Allow cast to a const List<T>&
template<class T>
inline Foam::UList<T>::operator const Foam::List<T>&() const
{
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index 36cdc80fbc1..fd8fe3f2d2b 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -273,12 +273,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-# include "UPtrListI.H"
+#include "UPtrListI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "UPtrList.C"
+ #include "UPtrList.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.H b/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
index 3fb7dc0e07d..f4af06792ca 100644
--- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
+++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -125,7 +125,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "NamedEnum.C"
+ #include "NamedEnum.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--
GitLab