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

STYLE: restore use of ITstream in argList parsing

Browse Source 
- can now be used as previously intended, since the scalarRange
  parsing has been fixed.
This commit is contained in:
Mark Olesen
2018-01-08 17:10:58 +01:00
parent adbbd0e678
commit 4deeba17c1
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/global/argList/argList.H
View File

@ -102,7 +102,7 @@ SourceFiles
#include "fileName.H" #include "fileName.H"
#include "parRun.H" #include "parRun.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "StringStream.H" #include "ITstream.H"
#include <utility> #include <utility>
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -317,7 +317,7 @@ public:
label count(std::initializer_list<word> optionNames) const; label count(std::initializer_list<word> optionNames) const;
//- Return an input stream from the named option //- Return an input stream from the named option
inline IStringStream lookup(const word& optName) const; inline ITstream lookup(const word& optName) const;
//- Read a value from the named option //- Read a value from the named option
// The default template parameter is string (ie, no conversion). // The default template parameter is string (ie, no conversion).
@ -369,7 +369,7 @@ public:
//- Return an input stream from the named option //- Return an input stream from the named option
// \deprecated in favour of lookup() - JAN-2018 // \deprecated in favour of lookup() - JAN-2018
inline IStringStream optionLookup(const word& optName) const; inline ITstream optionLookup(const word& optName) const;
//- Read a value from the named option //- Read a value from the named option
// \deprecated in favour of opt() - JAN-2018 // \deprecated in favour of opt() - JAN-2018

7
src/OpenFOAM/global/argList/argListI.H
View File

@ -105,9 +105,9 @@ inline bool Foam::argList::found(const word& optName) const
} }
inline Foam::IStringStream Foam::argList::lookup(const word& optName) const inline Foam::ITstream Foam::argList::lookup(const word& optName) const
{ {
return IStringStream(options_[optName]); return ITstream(optName, options_[optName]);
} }
@ -329,8 +329,7 @@ inline bool Foam::argList::optionFound(const word& optName) const
} }
inline Foam::IStringStream inline Foam::ITstream Foam::argList::optionLookup(const word& optName) const
Foam::argList::optionLookup(const word& optName) const
{ {
return lookup(optName); return lookup(optName);
} }