mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Resolved issues with virtual function inheritance and warning from clang
Also removed __GNUC__ conditional compilation statements which are no longer needed.
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -174,14 +174,14 @@ Foam::wordList Foam::coordinateSystems::toc() const
|
||||
}
|
||||
|
||||
|
||||
bool Foam::coordinateSystems::writeData(Ostream& os, bool subDict) const
|
||||
bool Foam::coordinateSystems::writeData(Ostream& os) const
|
||||
{
|
||||
os << nl << size() << nl << token::BEGIN_LIST;
|
||||
|
||||
forAll(*this, i)
|
||||
{
|
||||
os << nl;
|
||||
operator[](i).writeDict(os, subDict);
|
||||
operator[](i).writeDict(os, true);
|
||||
}
|
||||
|
||||
os << token::END_LIST << nl;
|
||||
|
||||
@ -133,7 +133,7 @@ public:
|
||||
wordList toc() const;
|
||||
|
||||
//- Write data
|
||||
bool writeData(Ostream&, bool subDict=true) const;
|
||||
bool writeData(Ostream&) const;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -71,6 +71,9 @@ private:
|
||||
pointIndexHit& info
|
||||
) const;
|
||||
|
||||
//- Inherit findNearest from searchableSurface
|
||||
using searchableSurface::findNearest;
|
||||
|
||||
//- Returns miss or hit with face (0..5)
|
||||
pointIndexHit findNearest
|
||||
(
|
||||
|
||||
@ -78,6 +78,9 @@ private:
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
//- Inherit findNearest from searchableSurface
|
||||
using searchableSurface::findNearest;
|
||||
|
||||
//- Find nearest point on cylinder.
|
||||
pointIndexHit findNearest
|
||||
(
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -71,6 +71,9 @@ private:
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
//- Inherit findNearest from searchableSurface
|
||||
using searchableSurface::findNearest;
|
||||
|
||||
//- Find nearest point on disk
|
||||
pointIndexHit findNearest
|
||||
(
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -80,6 +80,9 @@ private:
|
||||
//- Calculate normal direction from span
|
||||
static direction calcNormal(const point&);
|
||||
|
||||
//- Inherit findNearest from searchableSurface
|
||||
using searchableSurface::findNearest;
|
||||
|
||||
pointIndexHit findNearest
|
||||
(
|
||||
const point& sample,
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -69,6 +69,9 @@ private:
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
//- Inherit findNearest from searchableSurface
|
||||
using searchableSurface::findNearest;
|
||||
|
||||
//- Find nearest point on sphere.
|
||||
pointIndexHit findNearest
|
||||
(
|
||||
|
||||
@ -88,6 +88,9 @@ private:
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
//- Inherit findNearest from searchableSurface
|
||||
using searchableSurface::findNearest;
|
||||
|
||||
//- Find point nearest to sample. Updates minDistSqr. Sets nearestInfo
|
||||
// and surface index
|
||||
void findNearest
|
||||
|
||||
Reference in New Issue
Block a user