From a8cba8ba8fe04c25be26d19086a5483de8352141 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 28 Feb 2023 11:49:58 +0100 Subject: [PATCH] COMP: code adjustments for gcc-13 (#2714) --- .../db/dictionary/functionEntries/evalEntry/evalEntry.C | 2 +- src/OpenFOAM/matrices/Matrix/Matrix.C | 6 ++++-- src/OpenFOAM/primitives/strings/word/word.C | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C index 1efaa7790c..a95a7191d6 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C @@ -174,7 +174,7 @@ Foam::tokenList Foam::functionEntries::evalEntry::evaluate result.writeField(toks); } - return std::move(toks); + return tokenList(std::move(toks.tokens())); } diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C index 0ba6168888..d31edfb7b1 100644 --- a/src/OpenFOAM/matrices/Matrix/Matrix.C +++ b/src/OpenFOAM/matrices/Matrix/Matrix.C @@ -202,7 +202,8 @@ inline Foam::Matrix::Matrix ) : mRows_(Mb.m()), - nCols_(Mb.n()) + nCols_(Mb.n()), + v_(nullptr) { doAlloc(); @@ -224,7 +225,8 @@ inline Foam::Matrix::Matrix ) : mRows_(Mb.m()), - nCols_(Mb.n()) + nCols_(Mb.n()), + v_(nullptr) { doAlloc(); diff --git a/src/OpenFOAM/primitives/strings/word/word.C b/src/OpenFOAM/primitives/strings/word/word.C index 47c9ddd9f7..dca0561692 100644 --- a/src/OpenFOAM/primitives/strings/word/word.C +++ b/src/OpenFOAM/primitives/strings/word/word.C @@ -29,6 +29,7 @@ License #include "word.H" #include "debug.H" #include +#include #include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //