remove some clang - warnings

This commit is contained in:
Joachim Schöberl 2016-02-23 18:22:00 +01:00
parent e98451ef66
commit 938cbbcc1d
4 changed files with 12 additions and 7 deletions

View File

@ -407,6 +407,8 @@ namespace netgen
///
double GetMinH (const Point3d & pmin, const Point3d & pmax);
///
bool HasLocalHFunction () { return lochfunc != nullptr; }
///
LocalH & LocalHFunction () { return * lochfunc; }
///
bool LocalHFunctionGenerated(void) const { return (lochfunc != NULL); }
@ -633,7 +635,8 @@ namespace netgen
Identifications & GetIdentifications () { return *ident; }
/// return periodic, close surface etc. identifications
const Identifications & GetIdentifications () const { return *ident; }
///
bool HasIdentifications() const { return ident != nullptr; }
void InitPointCurve(double red = 1, double green = 0, double blue = 0) const;
void AddPointCurvePoint(const Point3d & pt) const;

View File

@ -17,8 +17,8 @@ namespace netgen
int meshed;
Array<INDEX_2> connectednodes;
if (&mesh3d.LocalHFunction() == NULL) mesh3d.CalcLocalH(mp.grading);
if (!mesh3d.HasLocalHFunction()) mesh3d.CalcLocalH(mp.grading);
mesh3d.Compress();

View File

@ -1291,6 +1291,7 @@ namespace netgen
bool Get (PointIndex pi1, PointIndex pi2, int identnr) const;
bool GetSymmetric (PointIndex pi1, PointIndex pi2, int identnr) const;
bool HasIdentifiedPoints() const { return identifiedpoints != nullptr; }
///
INDEX_2_HASHTABLE<int> & GetIdentifiedPoints ()
{

View File

@ -860,12 +860,13 @@ namespace netgen
// for (i = 1; i <= mesh->GetNSeg(); i++)
if (& mesh -> GetIdentifications() )
if (mesh -> HasIdentifications() )
{
INDEX_2_HASHTABLE<int> & idpts =
mesh->GetIdentifications().GetIdentifiedPoints();
if (&idpts)
if (mesh->GetIdentifications().HasIdentifiedPoints())
{
INDEX_2_HASHTABLE<int> & idpts =
mesh->GetIdentifications().GetIdentifiedPoints();
for (int i = 1; i <= idpts.GetNBags(); i++)
for (int j = 1; j <= idpts.GetBagSize(i); j++)
{