Skip to content
Snippets Groups Projects

long-term maintenance improvement for runTime selection tables

Merged long-term maintenance improvement for runTime selection tables
feature-runTimeCompat into develop
All threads resolved!
Merged Mark OLESEN requested to merge feature-runTimeCompat into develop
All threads resolved!
Viewing commit f1a77708
Show latest version
4 files
+ 40
− 37
Preferences
Compare changes
Files
4
  • f1a77708
    Mark OLESEN
    ENH: rename runTime selection typedefs · f1a77708
    Mark OLESEN authored 
    - better distinction between content and storage type
  by appending 'Type' to the typedef.

    old: 'Class::abcConstructorTable* tablePtr'
    new: 'Class::abcConstructorTableType* tablePtr'

  Was rarely used in any exposed code.

BREAKING: LESdelta::New with additional table

- parameter change to dictionaryConstructorTableType
  (was dictionaryConstructorTable)
src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
+ 12
− 12
@@ -51,16 +51,16 @@ Description
/* Construct from argList function pointer type */ \
typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \
\
/* Construct from argList function table type */ \
typedef HashTable \
/* Function table type: construct from argList */ \
typedef ::Foam::HashTable \
< \
argNames##ConstructorPtr, \
::Foam::word, \
::Foam::string::hasher \
> argNames##ConstructorTable; \
> argNames##ConstructorTableType; \
\
/* Construct from argList function pointer table pointer */ \
static argNames##ConstructorTable* argNames##ConstructorTablePtr_; \
static argNames##ConstructorTableType* argNames##ConstructorTablePtr_; \
\
/* Table constructor called from the table add function */ \
static void construct##argNames##ConstructorTables(); \
@@ -155,16 +155,16 @@ Description
/* Construct from argList function pointer type */ \
typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \
\
/* Construct from argList function table type */ \
typedef HashTable \
/* Function table type: construct from argList */ \
typedef ::Foam::HashTable \
< \
argNames##ConstructorPtr, \
::Foam::word, \
::Foam::string::hasher \
> argNames##ConstructorTable; \
> argNames##ConstructorTableType; \
\
/* Construct from argList function pointer table pointer */ \
static argNames##ConstructorTable* argNames##ConstructorTablePtr_; \
static argNames##ConstructorTableType* argNames##ConstructorTablePtr_; \
\
/* Table constructor called from the table add function */ \
static void construct##argNames##ConstructorTables(); \
@@ -272,7 +272,7 @@ Description
{ \
constructed = true; \
baseType::argNames##ConstructorTablePtr_ \
= new baseType::argNames##ConstructorTable; \
= new baseType::argNames##ConstructorTableType; \
} \
}
@@ -295,7 +295,7 @@ Description
#define defineRunTimeSelectionTablePtr(baseType,argNames) \
\
/* Define the constructor function table */ \
baseType::argNames##ConstructorTable* \
baseType::argNames##ConstructorTableType* \
baseType::argNames##ConstructorTablePtr_(nullptr)
@@ -335,7 +335,7 @@ Description
{ \
constructed = true; \
baseType<Targ>::argNames##ConstructorTablePtr_ \
= new baseType<Targ>::argNames##ConstructorTable; \
= new baseType<Targ>::argNames##ConstructorTableType; \
} \
}
@@ -359,7 +359,7 @@ Description
#define defineTemplatedRunTimeSelectionTablePtr(baseType,argNames,Targ) \
\
/* Define the constructor function table */ \
baseType<Targ>::argNames##ConstructorTable* \
baseType<Targ>::argNames##ConstructorTableType* \
baseType<Targ>::argNames##ConstructorTablePtr_(nullptr)