songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: avoid Istream/List operator() ambiguity (gcc-4.8.5)

Browse Source 
- introduced UList<bool>::operator()(label) as part of bf0b3d8872
  but with gcc-4.8.5 this participates in operator resolution even
  for non-bool lists!!
  Partial revert until this predicate handling is really required.
This commit is contained in:
Mark Olesen 2022-05-11 08:52:31 +02:00
parent dd560a6e3c
commit 0ed0856593
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -429,7 +429,7 @@ int main(int argc, char *argv[])
// Suboption: "insideBox"
if (subsetDict.found("insideBox"))
{
treeBoundBox bb(subsetDict.lookup("insideBox")());
treeBoundBox bb(subsetDict.lookup("insideBox"));
Info<< "Subset edges inside box " << bb << endl;
features().subsetBox(edgeStat, bb);
@ -447,7 +447,7 @@ int main(int argc, char *argv[])
// Suboption: "outsideBox"
else if (subsetDict.found("outsideBox"))
{
treeBoundBox bb(subsetDict.lookup("outsideBox")());
treeBoundBox bb(subsetDict.lookup("outsideBox"));
Info<< "Exclude edges outside box " << bb << endl;
features().excludeBox(edgeStat, bb);
@ -490,7 +490,7 @@ int main(int argc, char *argv[])
// Suboption: "plane"
if (subsetDict.found("plane"))
{
plane cutPlane(subsetDict.lookup("plane")());
plane cutPlane(subsetDict.lookup("plane"));
Info<< "Only include feature edges that intersect the plane"
<< " with normal " << cutPlane.normal()

10
src/OpenFOAM/containers/Lists/List/UList.H
View File

@ -511,16 +511,6 @@ public:
// Special Methods
//- Test \c bool value at specified position,
//- always false for out-of-range access. Same as test().
// \note Predicate definition as per bitSet, HashSet
template<class TypeT = T>
typename std::enable_if<std::is_same<bool, TypeT>::value, bool>::type
inline operator()(const label i) const
{
return (i >= 0 && i < size_ && v_[i]);
}
//- Test \c bool value at specified position,
//- always false for out-of-range access.
// \note Method name compatibility with bitSet, HashSet

9
src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-2021 OpenCFD Ltd.
Copyright (C) 2017-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef ITstream_H
#define ITstream_H
#ifndef Foam_ITstream_H
#define Foam_ITstream_H
#include "Istream.H"
#include "tokenList.H"
@ -346,6 +346,9 @@ public:
// Member Operators
//- Use operator() from Istream
using Istream::operator();
//- Copy assignment, with rewind()
void operator=(const ITstream& is);