From ef6e23b40449098360195d903e38455d7084b2c4 Mon Sep 17 00:00:00 2001
From: Knut Morten Okstad <knut.morten.okstad@sintef.no>
Date: Sat, 28 Dec 2024 18:48:15 +0100
Subject: [PATCH] Avoid referencing the macro argument defaultValue twice, in
 case it actually is a function call. Replace some typedef's by using.

---
 src/FFaLib/FFaContainers/FFaFieldContainer.H | 14 +++++++-------
 src/FFaLib/FFaContainers/FFaReference.H      |  2 +-
 src/FFaLib/FFaContainers/FFaReferenceList.H  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/FFaLib/FFaContainers/FFaFieldContainer.H b/src/FFaLib/FFaContainers/FFaFieldContainer.H
index f4d5c8f..6912019 100644
--- a/src/FFaLib/FFaContainers/FFaFieldContainer.H
+++ b/src/FFaLib/FFaContainers/FFaFieldContainer.H
@@ -141,16 +141,16 @@ protected:
 
   // The read/writable fields
 
-  typedef std::set<std::string> FDict;
-  typedef FDict::const_iterator FDictIt;
+  using FDict   = std::set<std::string>;
+  using FDictIt = FDict::const_iterator;
 
   struct FDictLess
   {
     bool operator()(FDictIt s1, FDictIt s2) const { return *s1 < *s2; }
   };
 
-  typedef std::map<FDictIt,FFaFieldBase*,FDictLess> FieldContainerMap;
-  typedef FFaSingelton<FDict,FFaFieldContainer>     FieldContainerDict;
+  using FieldContainerMap  = std::map<FDictIt,FFaFieldBase*,FDictLess>;
+  using FieldContainerDict = FFaSingelton<FDict,FFaFieldContainer>;
 
   FieldContainerMap myFields;
 
@@ -173,7 +173,7 @@ private:
 
   // The internal book keeping of who is pointing to whom
 
-  typedef std::vector<FFaReferenceBase*> ReferenceSet;
+  using ReferenceSet = std::vector<FFaReferenceBase*>;
 
   ReferenceSet                     myRefBy;
   std::list<FFaReferenceBase*>     myRefTo;
@@ -189,12 +189,12 @@ private:
 #define FFA_FIELD_INIT(field, defaultValue, identifier)			\
   this->addField(identifier, &field);					\
   field.setValue(defaultValue,false);					\
-  field.setDefaultValue(defaultValue,false)
+  field.setDefaultValue(field.getValue(),false)
 
 #define FFA_OBSOLETE_FIELD_INIT(field, defaultValue, identifier, obj)	\
   obj->addField(identifier, &field);					\
   field.setValue(defaultValue,false);					\
-  field.setDefaultValue(defaultValue,false)
+  field.setDefaultValue(field.getValue(),false)
 
 #define FFA_FIELD_DEFAULT_INIT(field, identifier)	\
   this->addField(identifier, &field)
diff --git a/src/FFaLib/FFaContainers/FFaReference.H b/src/FFaLib/FFaContainers/FFaReference.H
index 9137c39..7ed36bd 100644
--- a/src/FFaLib/FFaContainers/FFaReference.H
+++ b/src/FFaLib/FFaContainers/FFaReference.H
@@ -199,7 +199,7 @@ public:
   The pointer value in Fields of Ref pointers are not supposed to change.
 */
 
-typedef FFaReferenceBase* FFaRefPtr;
+using FFaRefPtr = FFaReferenceBase*;
 
 template<> inline
 FFaField<FFaRefPtr>::FFaField()
diff --git a/src/FFaLib/FFaContainers/FFaReferenceList.H b/src/FFaLib/FFaContainers/FFaReferenceList.H
index 46a475a..824adde 100644
--- a/src/FFaLib/FFaContainers/FFaReferenceList.H
+++ b/src/FFaLib/FFaContainers/FFaReferenceList.H
@@ -311,7 +311,7 @@ private:
   Specialized methods for FFaField.
 */
 
-typedef FFaReferenceListBase* FFaRefListPtr;
+using FFaRefListPtr = FFaReferenceListBase*;
 
 template<> inline
 FFaField<FFaRefListPtr>::FFaField()