From d8c0167ea87e95d231af32e1b825e40f3a189995 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 1 Aug 2018 21:27:46 +0200
Subject: [PATCH] STYLE: ensure that emptyLabelList is known from List.H

- treat as a List constant without requiring inclusion of ListOps.H

- replace use of emptyList<label>() with emptyLabelList directly.
  The emptyList<T>() casting is disallowed with many modern compilers
  and now marked as deprecated (expect early removal).

- relocate labelList typedef to List.H for more general access.
  Similar reasoning to having labelUList defined in UList.H
---
 .../dynamicIndexedOctree/dynamicIndexedOctree.C           | 2 +-
 src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C     | 4 ++--
 src/OpenFOAM/containers/Lists/List/List.H                 | 6 +++++-
 src/OpenFOAM/containers/Lists/ListOps/ListOps.C           | 2 +-
 src/OpenFOAM/containers/Lists/ListOps/ListOps.H           | 8 ++++----
 src/OpenFOAM/containers/Lists/SubList/SubList.H           | 7 +++++++
 src/OpenFOAM/containers/Lists/UList/UList.H               | 3 ++-
 src/OpenFOAM/primitives/ints/lists/labelList.H            | 7 ++++---
 8 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index 8b1d4274ac..9dca228407 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -2398,7 +2398,7 @@ const Foam::labelList& Foam::dynamicIndexedOctree<Type>::findIndices
         return *(contents_[getContent(contentIndex)]);
     }
 
-    return emptyList<label>();
+    return Foam::emptyLabelList;
 }
 
 
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index eecf3a99cd..ca2bd12fb7 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -2660,7 +2660,7 @@ const Foam::labelList& Foam::indexedOctree<Type>::findIndices
 {
     if (nodes_.empty())
     {
-        return emptyList<label>();
+        return Foam::emptyLabelList;
     }
 
     labelBits index = findNode(0, sample);
@@ -2675,7 +2675,7 @@ const Foam::labelList& Foam::indexedOctree<Type>::findIndices
         return contents_[getContent(contentIndex)];
     }
 
-    return emptyList<label>();
+    return Foam::emptyLabelList;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 96122a64d4..151214cb56 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -69,8 +69,12 @@ template<class T> class BiIndirectList;
 
 template<class T> Istream& operator>>(Istream& is, List<T>& list);
 
-// Commonly required list types
+// Common list types
 typedef List<char> charList;
+typedef List<label> labelList;
+
+//- A zero-sized list of labels
+extern const labelList emptyLabelList;
 
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
index cd9a3cbac5..5524ba27e9 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
@@ -26,7 +26,7 @@ License
 #include "ListOps.H"
 #include <numeric>
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Global Data Members * * * * * * * * * * * * * //
 
 const Foam::labelList Foam::emptyLabelList;
 
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index cd7ae1cbae..71f9bb8520 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -54,10 +54,10 @@ SourceFiles
 namespace Foam
 {
 
-extern const labelList emptyLabelList;
-
-//- Return reference to zero-sized list. Compare to List::null() which returns
-//  null pointer cast as list reference.
+//- Return reference to zero-sized list.
+//  Compare to List::null() which returns null pointer cast as list reference.
+//
+//  \deprecated This cast is disallowed with many modern compilers (JUL-2018)
 template<class Type>
 static const List<Type>& emptyList()
 {
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H
index 23ebc73f50..f70dc16b09 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubList.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H
@@ -47,6 +47,13 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declarations
+template<class T> class SubList;
+
+// Common list types
+typedef SubList<label> labelSubList;
+
+
 /*---------------------------------------------------------------------------*\
                            Class SubList Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 9170d1aea3..0ffa341f6a 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -67,10 +67,11 @@ template<class T> class UList;
 template<class T> Ostream& operator<<(Ostream&, const UList<T>&);
 template<class T> Istream& operator>>(Istream&, UList<T>&);
 
-// Commonly required list types
+// Common list types
 typedef UList<char> charUList;
 typedef UList<label> labelUList;
 
+
 /*---------------------------------------------------------------------------*\
                            Class UList Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/primitives/ints/lists/labelList.H b/src/OpenFOAM/primitives/ints/lists/labelList.H
index a25fc5767a..30734bda10 100644
--- a/src/OpenFOAM/primitives/ints/lists/labelList.H
+++ b/src/OpenFOAM/primitives/ints/lists/labelList.H
@@ -64,9 +64,10 @@ Description
 
 namespace Foam
 {
-    // NB: labelUList is defined in UList itself
-    typedef List<label> labelList;
-    typedef SubList<label> labelSubList;
+    // labelUList   = defined in UList.H
+    // labelList    = defined in List.H
+    // labelSubList = defined in SubList.H
+
     typedef List<labelList> labelListList;
     typedef List<labelListList> labelListListList;
 }