Temporary fixes to static initialisation for Gcc-15/Clang-20

Henry Weller · Henry Weller · commit 12ad3e6541c9 · 2025-07-05T11:26:28.000+01:00
diff --git a/src/OpenFOAM/global/constants/dimensionedConstants.C b/src/OpenFOAM/global/constants/dimensionedConstants.C
@@ -122,7 +122,7 @@ Foam::dimensionedScalar Foam::dimensionedConstant
 
     if (!dict.found(group))
     {
-        dict.add(group, dictionary::null);
+        dict.add(group, dictionary());
     }
 
     dict.subDict(group).add(entryName, dimensionedValue);
@@ -163,7 +163,7 @@ Foam::dimensionedScalar Foam::dimensionedConstant
 
     if (!dict.found(group))
     {
-        dict.add(group, dictionary::null);
+        dict.add(group, dictionary());
     }
 
     dict.subDict(group).add(entryName, dimensionedValue);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C b/src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2025 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ const Foam::wordList Foam::Function1s::Coded<Type>::codeKeys
 template<class Type>
 const Foam::wordList Foam::Function1s::Coded<Type>::codeDictVars
 (
-    {word::null, word::null}
+    {word(), word()}
 );
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C b/src/OpenFOAM/primitives/functions/Function2/Coded/CodedFunction2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2024 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2025 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ const Foam::wordList Foam::Function2s::Coded<Type>::codeKeys
 template<class Type>
 const Foam::wordList Foam::Function2s::Coded<Type>::codeDictVars
 (
-    {word::null, word::null}
+    {word(), word()}
 );
 
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ Foam::dimensionedScalar Foam::dimensionedConstant`
`122`	`122`
`123`	`123`	`if (!dict.found(group))`
`124`	`124`	`{`
`125`		`- dict.add(group, dictionary::null);`
	`125`	`+ dict.add(group, dictionary());`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`dict.subDict(group).add(entryName, dimensionedValue);`
`@@ -163,7 +163,7 @@ Foam::dimensionedScalar Foam::dimensionedConstant`
`163`	`163`
`164`	`164`	`if (!dict.found(group))`
`165`	`165`	`{`
`166`		`- dict.add(group, dictionary::null);`
	`166`	`+ dict.add(group, dictionary());`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`dict.subDict(group).add(entryName, dimensionedValue);`