diff --git a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
index 336927c38f6a62187c90ac919146b7548b64022e..a6a2a528df6f96603cfb191b235e0ccb5797e252 100644
--- a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
@@ -52,8 +52,12 @@ Description
typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \
\
/* Construct from argList function table type */ \
- typedef HashTable<argNames##ConstructorPtr, word> \
- argNames##ConstructorTable; \
+ typedef HashTable \
+ < \
+ argNames##ConstructorPtr, \
+ ::Foam::word, \
+ ::Foam::string::hasher \
+ > argNames##ConstructorTable; \
\
/* Construct from argList function pointer table pointer */ \
static argNames##ConstructorTable* argNames##ConstructorTablePtr_; \
@@ -77,7 +81,7 @@ Description
\
explicit add##argNames##ConstructorToTable \
( \
- const word& lookup = baseType##Type::typeName \
+ const ::Foam::word& lookup = baseType##Type::typeName \
) \
{ \
construct##argNames##ConstructorTables(); \
@@ -109,7 +113,7 @@ Description
{ \
public: \
\
- const word name; /* Lookup name for later removal */ \
+ const ::Foam::word name; /* Lookup name for later removal */ \
\
static autoPtr<baseType> New argList \
{ \
@@ -118,7 +122,7 @@ Description
\
explicit addRemovable##argNames##ConstructorToTable \
( \
- const word& lookup = baseType##Type::typeName \
+ const ::Foam::word& lookup = baseType##Type::typeName \
) \
: \
name(lookup) \
@@ -152,8 +156,12 @@ Description
typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \
\
/* Construct from argList function table type */ \
- typedef HashTable<argNames##ConstructorPtr, word> \
- argNames##ConstructorTable; \
+ typedef HashTable \
+ < \
+ argNames##ConstructorPtr, \
+ ::Foam::word, \
+ ::Foam::string::hasher \
+ > argNames##ConstructorTable; \
\
/* Construct from argList function pointer table pointer */ \
static argNames##ConstructorTable* argNames##ConstructorTablePtr_; \
@@ -177,7 +185,7 @@ Description
\
explicit add##argNames##ConstructorToTable \
( \
- const word& lookup = baseType##Type::typeName \
+ const ::Foam::word& lookup = baseType##Type::typeName \
) \
{ \
construct##argNames##ConstructorTables(); \
@@ -215,7 +223,7 @@ Description
{ \
public: \
\
- const word name; /* Lookup name for later removal */ \
+ const ::Foam::word name; /* Lookup name for later removal */ \
\
static autoPtr<baseType> New##baseType argList \
{ \
@@ -224,7 +232,7 @@ Description
\
explicit addRemovable##argNames##ConstructorToTable \
( \
- const word& lookup = baseType##Type::typeName \
+ const ::Foam::word& lookup = baseType##Type::typeName \
) \
: \
name(lookup) \
diff --git a/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
index a92954fbd6a44ed5176522f929ab0607a4632eeb..df70160dad320ebad8d37ba7f375f51019a895b7 100644
--- a/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
+++ b/src/OpenFOAM/db/runTimeSelection/memberFunctions/memberFunctionSelectionTables.H
@@ -46,8 +46,12 @@ Description
typedef returnType (*memberFunction##argNames##MemberFunctionPtr)argList; \
\
/* Construct from argList function table type */ \
- typedef HashTable<memberFunction##argNames##MemberFunctionPtr, word> \
- memberFunction##argNames##MemberFunctionTable; \
+ typedef HashTable \
+ < \
+ memberFunction##argNames##MemberFunctionPtr, \
+ ::Foam::word, \
+ ::Foam::string::hasher \
+ > memberFunction##argNames##MemberFunctionTable; \
\
/* Construct from argList function pointer table pointer */ \
static memberFunction##argNames##MemberFunctionTable* \
@@ -61,7 +65,7 @@ Description
\
explicit add##memberFunction##argNames##MemberFunctionToTable \
( \
- const word& lookup = baseType##Type::typeName \
+ const ::Foam::word& lookup = baseType##Type::typeName \
) \
{ \
construct##memberFunction##argNames##MemberFunctionTables(); \