Avoid referencing the macro argument defaultValue twice,

in case it actually is a function call. Replace some typedef's by using.
openfedem · Dec 29, 2024 · ef6e23b · ef6e23b
1 parent eb8da65
commit ef6e23b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -311,7 +311,7 @@ private:
   Specialized methods for FFaField.
 */
 
-typedef FFaReferenceListBase* FFaRefListPtr;
+using FFaRefListPtr = FFaReferenceListBase*;
 
 template<> inline
 FFaField<FFaRefListPtr>::FFaField()