STYLE: consistent ordering of "inline explicit" vs. "explicit inline"

- resolve in favour of "inline explicit", which had marginally more
  uses and provides consistent prefixing for inline methods.
This commit is contained in:
Mark Olesen 2018-05-30 12:11:13 +02:00
parent f9fe71815a
commit 2aaae74ee1
23 changed files with 53 additions and 53 deletions

View File

@ -86,7 +86,7 @@
// - 0: different // - 0: different
// - +1: identical // - +1: identical
// - -1: same face, but different orientation // - -1: same face, but different orientation
static inline int compare(const triFace&, const triFace&); static int compare(const triFace&, const triFace&);
#+end_src #+end_src
or or
#+begin_src C++ #+begin_src C++
@ -95,7 +95,7 @@
// - 0: different // - 0: different
// - +1: identical // - +1: identical
// - -1: same face, but different orientation // - -1: same face, but different orientation
static inline int compare(const triFace&, const triFace&); static int compare(const triFace&, const triFace&);
#+end_src #+end_src
*not* *not*
#+begin_src C++ #+begin_src C++
@ -103,7 +103,7 @@
// - 0: different // - 0: different
// - +1: identical // - +1: identical
// - -1: same face, but different orientation // - -1: same face, but different orientation
static inline int compare(const triFace&, const triFace&); static int compare(const triFace&, const triFace&);
#+end_src #+end_src
+ List can be nested for example + List can be nested for example
#+begin_src C++ #+begin_src C++

View File

@ -229,7 +229,7 @@ public:
inline constexpr PackedList() noexcept; inline constexpr PackedList() noexcept;
//- Construct for given number of elements, initializes values to 0 //- Construct for given number of elements, initializes values to 0
explicit inline PackedList(const label numElem); inline explicit PackedList(const label numElem);
//- Construct for given number of elements, and the specified //- Construct for given number of elements, and the specified
//- value for each element //- value for each element
@ -245,10 +245,10 @@ public:
inline PackedList(PackedList<Width>&& rhs); inline PackedList(PackedList<Width>&& rhs);
//- Construct from a list of values //- Construct from a list of values
explicit inline PackedList(const labelUList& values); inline explicit PackedList(const labelUList& values);
//- Construct from a list of values //- Construct from a list of values
explicit inline PackedList(const labelUIndList& values); inline explicit PackedList(const labelUIndList& values);
//- Clone //- Clone
inline autoPtr<PackedList<Width>> clone() const; inline autoPtr<PackedList<Width>> clone() const;

View File

@ -142,7 +142,7 @@ public:
explicit bitSet(Istream& is); explicit bitSet(Istream& is);
//- Construct with given size, with all bits set to 0 //- Construct with given size, with all bits set to 0
explicit inline bitSet(const label n); inline explicit bitSet(const label n);
//- Construct with given size and value for all elements //- Construct with given size and value for all elements
inline bitSet(const label n, const bool val); inline bitSet(const label n, const bool val);
@ -154,7 +154,7 @@ public:
inline bitSet(bitSet&& bitset); inline bitSet(bitSet&& bitset);
//- Construct from a list of bools //- Construct from a list of bools
explicit inline bitSet(const UList<bool>& bools); inline explicit bitSet(const UList<bool>& bools);
//- Construct with given size with all bits set to 0, //- Construct with given size with all bits set to 0,
//- subsequently add specified locations as 1. //- subsequently add specified locations as 1.
@ -170,11 +170,11 @@ public:
//- Construct with automatic sizing (filled with 0), //- Construct with automatic sizing (filled with 0),
//- and populate with specified locations as 1. //- and populate with specified locations as 1.
explicit inline bitSet(const labelUList& locations); inline explicit bitSet(const labelUList& locations);
//- Construct with automatic sizing (filled with 0), //- Construct with automatic sizing (filled with 0),
//- and populate with specified locations as 1. //- and populate with specified locations as 1.
explicit inline bitSet(const labelUIndList& locations); inline explicit bitSet(const labelUIndList& locations);
//- Clone //- Clone
inline autoPtr<bitSet> clone() const; inline autoPtr<bitSet> clone() const;

View File

@ -96,7 +96,7 @@ public:
inline HashPtrTable(); inline HashPtrTable();
//- Construct given initial table capacity //- Construct given initial table capacity
explicit inline HashPtrTable(const label size); inline explicit HashPtrTable(const label size);
//- Construct from Istream using given Istream constructor class //- Construct from Istream using given Istream constructor class
template<class INew> template<class INew>

View File

@ -118,7 +118,7 @@ public:
inline constexpr DynamicList() noexcept; inline constexpr DynamicList() noexcept;
//- Construct an empty list with given reserve size. //- Construct an empty list with given reserve size.
explicit inline DynamicList(const label nElem); inline explicit DynamicList(const label nElem);
//- Construct with given size and value for all elements. //- Construct with given size and value for all elements.
inline DynamicList(const label nElem, const T& val); inline DynamicList(const label nElem, const T& val);
@ -135,7 +135,7 @@ public:
//- Construct from UList. Size set to UList size. //- Construct from UList. Size set to UList size.
// Also constructs from DynamicList with different sizing parameters. // Also constructs from DynamicList with different sizing parameters.
explicit inline DynamicList(const UList<T>& lst); inline explicit DynamicList(const UList<T>& lst);
//- Construct from a FixedList //- Construct from a FixedList
template<unsigned FixedSize> template<unsigned FixedSize>
@ -147,10 +147,10 @@ public:
inline DynamicList(InputIterator begIter, InputIterator endIter); inline DynamicList(InputIterator begIter, InputIterator endIter);
//- Construct from an initializer list. Size set to list size. //- Construct from an initializer list. Size set to list size.
explicit inline DynamicList(std::initializer_list<T> lst); inline explicit DynamicList(std::initializer_list<T> lst);
//- Construct from UIndirectList. Size set to UIndirectList size. //- Construct from UIndirectList. Size set to UIndirectList size.
explicit inline DynamicList(const UIndirectList<T>& lst); inline explicit DynamicList(const UIndirectList<T>& lst);
//- Move construct. //- Move construct.
inline DynamicList(DynamicList<T, SizeMin>&& lst); inline DynamicList(DynamicList<T, SizeMin>&& lst);

View File

@ -162,13 +162,13 @@ public:
inline FixedList() = default; inline FixedList() = default;
//- Construct and initialize all entries to given value //- Construct and initialize all entries to given value
explicit inline FixedList(const T& val); inline explicit FixedList(const T& val);
//- Construct and initialize all entries to zero //- Construct and initialize all entries to zero
explicit inline FixedList(const zero); inline explicit FixedList(const zero);
//- Copy construct from C-array //- Copy construct from C-array
explicit inline FixedList(const T list[Size]); inline explicit FixedList(const T list[Size]);
//- Copy constructor //- Copy constructor
inline FixedList(const FixedList<T, Size>& list); inline FixedList(const FixedList<T, Size>& list);
@ -186,10 +186,10 @@ public:
inline FixedList(std::initializer_list<T> list); inline FixedList(std::initializer_list<T> list);
//- Construct from UList //- Construct from UList
explicit inline FixedList(const UList<T>& list); inline explicit FixedList(const UList<T>& list);
//- Construct from SLList //- Construct from SLList
explicit inline FixedList(const SLList<T>& list); inline explicit FixedList(const SLList<T>& list);
//- Construct from Istream //- Construct from Istream
FixedList(Istream& is); FixedList(Istream& is);

View File

@ -73,10 +73,10 @@ protected:
// Constructors // Constructors
//- Copy construct from addressing array //- Copy construct from addressing array
explicit inline IndirectListAddressing(const labelUList& addr); inline explicit IndirectListAddressing(const labelUList& addr);
//- Move construct from addressing array //- Move construct from addressing array
explicit inline IndirectListAddressing(List<label>&& addr); inline explicit IndirectListAddressing(List<label>&& addr);
// Member Functions // Member Functions
@ -127,7 +127,7 @@ public:
//- Copy construct addressing, shallow copy values list reference //- Copy construct addressing, shallow copy values list reference
//- from UIndirectList //- from UIndirectList
explicit inline IndirectList(const UIndirectList<T>& list); inline explicit IndirectList(const UIndirectList<T>& list);
// Member Functions // Member Functions

View File

@ -69,7 +69,7 @@ public:
//- Construct given size, sort later. //- Construct given size, sort later.
// The indices remain empty until the list is sorted // The indices remain empty until the list is sorted
explicit inline SortableList(const label size); inline explicit SortableList(const label size);
//- Construct given size and initial value. Sort later on //- Construct given size and initial value. Sort later on
// The indices remain empty until the list is sorted // The indices remain empty until the list is sorted

View File

@ -75,7 +75,7 @@ public:
inline constexpr PtrDynList() noexcept; inline constexpr PtrDynList() noexcept;
//- Construct with given capacity. //- Construct with given capacity.
explicit inline PtrDynList(const label len); inline explicit PtrDynList(const label len);
//- Copy construct using 'clone()' method on each element //- Copy construct using 'clone()' method on each element
inline PtrDynList(const PtrDynList<T, SizeMin>& list); inline PtrDynList(const PtrDynList<T, SizeMin>& list);

View File

@ -88,7 +88,7 @@ public:
inline constexpr PtrList() noexcept; inline constexpr PtrList() noexcept;
//- Construct with specified size, each element initialized to nullptr //- Construct with specified size, each element initialized to nullptr
explicit inline PtrList(const label len); inline explicit PtrList(const label len);
//- Copy construct using 'clone()' method on each element //- Copy construct using 'clone()' method on each element
inline PtrList(const PtrList<T>& list); inline PtrList(const PtrList<T>& list);

View File

@ -110,7 +110,7 @@ public:
inline constexpr UPtrList() noexcept; inline constexpr UPtrList() noexcept;
//- Construct with specified size, each element initialized to nullptr //- Construct with specified size, each element initialized to nullptr
explicit inline UPtrList(const label len); inline explicit UPtrList(const label len);
//- Copy construct (shallow copies addresses) //- Copy construct (shallow copies addresses)
inline UPtrList(const UPtrList<T>& list); inline UPtrList(const UPtrList<T>& list);
@ -129,7 +129,7 @@ public:
//- Construct from UList, taking the address of each list element //- Construct from UList, taking the address of each list element
// The argument is non-const to reflect that the UPtrList can change // The argument is non-const to reflect that the UPtrList can change
// the values of the original list. // the values of the original list.
explicit inline UPtrList(UList<T>& list); inline explicit UPtrList(UList<T>& list);
// Member functions // Member functions

View File

@ -103,7 +103,7 @@ public:
inline constexpr DynamicField() noexcept; inline constexpr DynamicField() noexcept;
//- Construct empty field with given reserve size. //- Construct empty field with given reserve size.
explicit inline DynamicField(const label len); inline explicit DynamicField(const label len);
//- Construct given size and initial value //- Construct given size and initial value
inline DynamicField(const label len, const T& val); inline DynamicField(const label len, const T& val);
@ -120,13 +120,13 @@ public:
//- Copy construct from UList. Size set to UList size. //- Copy construct from UList. Size set to UList size.
// Also constructs from DynamicField with different sizing parameters. // Also constructs from DynamicField with different sizing parameters.
explicit inline DynamicField(const UList<T>& list); inline explicit DynamicField(const UList<T>& list);
//- Copy construct from UIndirectList //- Copy construct from UIndirectList
explicit inline DynamicField(const UIndirectList<T>& list); inline explicit DynamicField(const UIndirectList<T>& list);
//- Move construct from List contents //- Move construct from List contents
explicit inline DynamicField(List<T>&& content); inline explicit DynamicField(List<T>&& content);
//- Move construct from dynamic Field contents //- Move construct from dynamic Field contents
inline DynamicField(DynamicField<T, SizeMin>&& content); inline DynamicField(DynamicField<T, SizeMin>&& content);

View File

@ -75,7 +75,7 @@ public:
inline SubField(const SubList<Type>&); inline SubField(const SubList<Type>&);
//- Construct from a UList\<Type\>, using the entire size //- Construct from a UList\<Type\>, using the entire size
explicit inline SubField(const UList<Type>&); inline explicit SubField(const UList<Type>&);
//- Construct from a UList\<Type\> with a given size //- Construct from a UList\<Type\> with a given size
inline SubField inline SubField

View File

@ -85,7 +85,7 @@ public:
inline boundBox(); inline boundBox();
//- Construct a bounding box containing a single initial point //- Construct a bounding box containing a single initial point
explicit inline boundBox(const point& pt); inline explicit boundBox(const point& pt);
//- Construct from components //- Construct from components
inline boundBox(const point& min, const point& max); inline boundBox(const point& min, const point& max);

View File

@ -67,13 +67,13 @@ public:
inline cell(); inline cell();
//- Construct given size, with invalid point labels (-1) //- Construct given size, with invalid point labels (-1)
explicit inline cell(const label sz); inline explicit cell(const label sz);
//- Copy construct from list of labels //- Copy construct from list of labels
explicit inline cell(const labelUList& lst); inline explicit cell(const labelUList& lst);
//- Move construct from list of labels //- Move construct from list of labels
explicit inline cell(labelList&& lst); inline explicit cell(labelList&& lst);
//- Construct from Istream //- Construct from Istream
inline cell(Istream& is); inline cell(Istream& is);

View File

@ -148,20 +148,20 @@ public:
inline face(); inline face();
//- Construct given size, with invalid point labels (-1) //- Construct given size, with invalid point labels (-1)
explicit inline face(const label sz); inline explicit face(const label sz);
//- Copy construct from list of labels //- Copy construct from list of labels
explicit inline face(const labelUList& lst); inline explicit face(const labelUList& lst);
//- Copy construct from list of labels //- Copy construct from list of labels
template<unsigned Size> template<unsigned Size>
explicit inline face(const FixedList<label, Size>& lst); inline explicit face(const FixedList<label, Size>& lst);
//- Copy construct from an initializer list of labels //- Copy construct from an initializer list of labels
explicit inline face(std::initializer_list<label> lst); inline explicit face(std::initializer_list<label> lst);
//- Move construct from list of labels //- Move construct from list of labels
explicit inline face(labelList&& lst); inline explicit face(labelList&& lst);
//- Copy construct from triFace //- Copy construct from triFace
face(const triFace& f); face(const triFace& f);

View File

@ -97,10 +97,10 @@ public:
//- Construct from a list of 3 or 4 labels. //- Construct from a list of 3 or 4 labels.
// Default region is 0. // Default region is 0.
explicit inline labelledTri(const labelUList&); inline explicit labelledTri(const labelUList&);
//- Construct from an initializer list of 3 or 4 labels. //- Construct from an initializer list of 3 or 4 labels.
explicit inline labelledTri(std::initializer_list<label>); inline explicit labelledTri(std::initializer_list<label>);
//- Construct from Istream //- Construct from Istream
inline labelledTri(Istream&); inline labelledTri(Istream&);

View File

@ -81,7 +81,7 @@ public:
inline tetCell(const FixedList<label, 4>& lst); inline tetCell(const FixedList<label, 4>& lst);
//- Construct from an initializer list of four point labels //- Construct from an initializer list of four point labels
explicit inline tetCell(std::initializer_list<label> lst); inline explicit tetCell(std::initializer_list<label> lst);
//- Construct from Istream //- Construct from Istream
inline tetCell(Istream& is); inline tetCell(Istream& is);

View File

@ -87,10 +87,10 @@ public:
); );
//- Copy construct from a list of three point labels. //- Copy construct from a list of three point labels.
explicit inline triFace(const labelUList& lst); inline explicit triFace(const labelUList& lst);
//- Construct from an initializer list of three point labels //- Construct from an initializer list of three point labels
explicit inline triFace(std::initializer_list<label> lst); inline explicit triFace(std::initializer_list<label> lst);
//- Construct from Istream //- Construct from Istream
inline triFace(Istream& is); inline triFace(Istream& is);

View File

@ -162,10 +162,10 @@ public:
inline treeBoundBox(); inline treeBoundBox();
//- Construct from a boundBox //- Construct from a boundBox
explicit inline treeBoundBox(const boundBox& bb); inline explicit treeBoundBox(const boundBox& bb);
//- Construct a bounding box containing a single initial point //- Construct a bounding box containing a single initial point
explicit inline treeBoundBox(const point& pt); inline explicit treeBoundBox(const point& pt);
//- Construct from components //- Construct from components
inline treeBoundBox(const point& min, const point& max); inline treeBoundBox(const point& min, const point& max);

View File

@ -108,10 +108,10 @@ public:
inline SHA1(); inline SHA1();
//- Construct null and append initial std::string //- Construct null and append initial std::string
explicit inline SHA1(const std::string&); inline explicit SHA1(const std::string&);
//- Construct null and append initial string //- Construct null and append initial string
explicit inline SHA1(const char*); inline explicit SHA1(const char*);
// Member Functions // Member Functions

View File

@ -92,7 +92,7 @@ public:
inline scalarRange(); inline scalarRange();
//- Construct an exact value matcher //- Construct an exact value matcher
explicit inline scalarRange(const scalar value); inline explicit scalarRange(const scalar value);
//- Construct a range from min-value to max-value //- Construct a range from min-value to max-value
inline scalarRange(const scalar minVal, const scalar maxVal); inline scalarRange(const scalar minVal, const scalar maxVal);

View File

@ -92,7 +92,7 @@ public:
// This also handles a wordHashSet, which is derived from a HashTable. // This also handles a wordHashSet, which is derived from a HashTable.
// The result is similar to a HashTable::sortedToc. // The result is similar to a HashTable::sortedToc.
template<class AnyType, class AnyHash> template<class AnyType, class AnyHash>
explicit inline hashedWordList inline explicit hashedWordList
( (
const HashTable<AnyType, word, AnyHash>& tbl const HashTable<AnyType, word, AnyHash>& tbl
); );