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

BUG: IOstream::compressionEnum() used Switch::switchType incorrectly

Browse Source 
- use enhanced Switch constructor and the new valid() method to
  avoid potential pitfalls of using Switch::switchType directly.
This commit is contained in:
Mark Olesen
2010-04-16 15:43:28 +02:00
parent a17daf7fcc
commit ad1f99ff71
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
View File

@ -61,9 +61,9 @@ Foam::IOstream::compressionType
Foam::IOstream::compressionEnum(const word& compression)
{
// get Switch (bool) value, but allow it to fail
Switch::switchType sw = Switch::asEnum(compression, true);
Switch sw(compression, true);
if (sw != Switch::INVALID)
if (sw.valid())
{
return sw ? IOstream::COMPRESSED : IOstream::UNCOMPRESSED;
}

3
src/OpenFOAM/primitives/bools/Switch/Switch.C
View File

@ -83,7 +83,7 @@ Foam::Switch::switchType Foam::Switch::asEnum
<< abort(FatalError);
}
return INVALID;
return Switch::INVALID;
}
@ -115,7 +115,6 @@ bool Foam::Switch::asBool
return false;
}
return (sw & 0x1);
}

12
src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
View File

@ -53,9 +53,13 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
else if (t.isWord())
{
// allow invalid values, but catch after for correct error message
Switch::switchType sw = Switch::asEnum(t.wordToken(), true);
Switch sw(t.wordToken(), true);
if (sw == Switch::INVALID)
if (sw.valid())
{
s.switch_ = sw.switch_;
}
else
{
is.setBad();
FatalIOErrorIn("operator>>(Istream&, Switch&)", is)
@ -64,10 +68,6 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
return is;
}
else
{
s.switch_ = sw;
}
}
else
{