zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: resolve abi:cxx11 linker issue (fixes #2147)

Browse Source 
Issue first shows up on gcc-11 with these types of library symbols:

     U Foam::tableReader<double>::dictionaryConstructorTablePtr_[abi:cxx11]
  xx B Foam::tableReader<double>::dictionaryConstructorTablePtr_

  Use concrete hasher functor for runtime selection tables, which
  avoids any additional template resolutions (introduced with
  95cd8ee75c). The library symbols now resolve _without_ an
  additional abi:cxx11 tag.
This commit is contained in:
Mark Olesen
2021-07-08 13:54:07 +02:00
parent 014dbf4004
commit 028ca26617
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
View File

@ -52,8 +52,12 @@ Description
typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \ typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \
\ \
/* Construct from argList function table type */ \ /* Construct from argList function table type */ \
typedef HashTable<argNames##ConstructorPtr, word> \ typedef HashTable \
argNames##ConstructorTable; \ < \
argNames##ConstructorPtr, \
::Foam::word, \
::Foam::string::hasher \
> argNames##ConstructorTable; \
\ \
/* Construct from argList function pointer table pointer */ \ /* Construct from argList function pointer table pointer */ \
static argNames##ConstructorTable* argNames##ConstructorTablePtr_; \ static argNames##ConstructorTable* argNames##ConstructorTablePtr_; \
@ -77,7 +81,7 @@ Description
\ \
explicit add##argNames##ConstructorToTable \ explicit add##argNames##ConstructorToTable \
( \ ( \
const word& lookup = baseType##Type::typeName \ const ::Foam::word& lookup = baseType##Type::typeName \
) \ ) \
{ \ { \
construct##argNames##ConstructorTables(); \ construct##argNames##ConstructorTables(); \
@ -109,7 +113,7 @@ Description
{ \ { \
public: \ public: \
\ \
const word name; /* Lookup name for later removal */ \ const ::Foam::word name; /* Lookup name for later removal */ \
\ \
static autoPtr<baseType> New argList \ static autoPtr<baseType> New argList \
{ \ { \
@ -118,7 +122,7 @@ Description
\ \
explicit addRemovable##argNames##ConstructorToTable \ explicit addRemovable##argNames##ConstructorToTable \
( \ ( \
const word& lookup = baseType##Type::typeName \ const ::Foam::word& lookup = baseType##Type::typeName \
) \ ) \
: \ : \
name(lookup) \ name(lookup) \
@ -152,8 +156,12 @@ Description
typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \ typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \
\ \
/* Construct from argList function table type */ \ /* Construct from argList function table type */ \
typedef HashTable<argNames##ConstructorPtr, word> \ typedef HashTable \
argNames##ConstructorTable; \ < \
argNames##ConstructorPtr, \
::Foam::word, \
::Foam::string::hasher \
> argNames##ConstructorTable; \
\ \
/* Construct from argList function pointer table pointer */ \ /* Construct from argList function pointer table pointer */ \
static argNames##ConstructorTable* argNames##ConstructorTablePtr_; \ static argNames##ConstructorTable* argNames##ConstructorTablePtr_; \
@ -177,7 +185,7 @@ Description
\ \
explicit add##argNames##ConstructorToTable \ explicit add##argNames##ConstructorToTable \
( \ ( \
const word& lookup = baseType##Type::typeName \ const ::Foam::word& lookup = baseType##Type::typeName \
) \ ) \
{ \ { \
construct##argNames##ConstructorTables(); \ construct##argNames##ConstructorTables(); \
@ -215,7 +223,7 @@ Description
{ \ { \
public: \ public: \
\ \
const word name; /* Lookup name for later removal */ \ const ::Foam::word name; /* Lookup name for later removal */ \
\ \
static autoPtr<baseType> New##baseType argList \ static autoPtr<baseType> New##baseType argList \
{ \ { \
@ -224,7 +232,7 @@ Description
\ \
explicit addRemovable##argNames##ConstructorToTable \ explicit addRemovable##argNames##ConstructorToTable \
( \ ( \
const word& lookup = baseType##Type::typeName \ const ::Foam::word& lookup = baseType##Type::typeName \
) \ ) \
: \ : \
name(lookup) \ name(lookup) \

10
src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
View File

@ -46,8 +46,12 @@ Description
typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \ typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
\ \
/* Construct from argList function table type */ \ /* Construct from argList function table type */ \
typedef HashTable<memberFunction##argNames##MemberFunctionPtr, word> \ typedef HashTable \
memberFunction##argNames##MemberFunctionTable; \ < \
memberFunction##argNames##MemberFunctionPtr, \
::Foam::word, \
::Foam::string::hasher \
> memberFunction##argNames##MemberFunctionTable; \
\ \
/* Construct from argList function pointer table pointer */ \ /* Construct from argList function pointer table pointer */ \
static memberFunction##argNames##MemberFunctionTable* \ static memberFunction##argNames##MemberFunctionTable* \
@ -61,7 +65,7 @@ Description
\ \
explicit add##memberFunction##argNames##MemberFunctionToTable \ explicit add##memberFunction##argNames##MemberFunctionToTable \
( \ ( \
const word& lookup = baseType##Type::typeName \ const ::Foam::word& lookup = baseType##Type::typeName \
) \ ) \
{ \ { \
construct##memberFunction##argNames##MemberFunctionTables(); \ construct##memberFunction##argNames##MemberFunctionTables(); \