Skip to content

Commit 3bfa6c1

Browse files
committed
Fix build warnings (found with gcc -Wall)
1 parent 0c1943c commit 3bfa6c1

18 files changed

Lines changed: 68 additions & 65 deletions

libsrc/core/array.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,9 @@ namespace ngcore
842842
NETGEN_INLINE void NothingToDelete ()
843843
{
844844
mem_to_delete = nullptr;
845+
846+
// this memory is not managed by the Array anymore, so set the memory usage to 0
847+
mt.Free(sizeof(T)*allocsize);
845848
}
846849

847850
/// Change logical size. If necessary, do reallocation. Keeps contents.

libsrc/csg/csgeom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ namespace netgen
12111211
PrintMessage (2, "Object ", i, " has ", tams->GetNT(), " triangles");
12121212
}
12131213
}
1214-
catch (exception)
1214+
catch (const std::exception &)
12151215
{
12161216
cerr << "*************************************************************" << endl
12171217
<< "**** out of memory problem in CSG visualization ****" << endl

libsrc/general/table.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ namespace netgen
109109
{
110110
void * p = new char [(line.maxsize+5) * elsize];
111111

112-
if (line.maxsize*elsize)
112+
if (line.maxsize && elsize)
113113
memcpy (p, line.col, line.maxsize * elsize);
114114
delete [] (char*)line.col;
115115

libsrc/interface/nginterface_v2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ namespace netgen
10411041
build_searchtree);
10421042
return ind - 1;
10431043
}
1044-
catch(NgException e) // quads not implemented curved yet
1044+
catch(const NgException & e) // quads not implemented curved yet
10451045
{
10461046
for (SegmentIndex si = 0; si < mesh->GetNSeg(); si++)
10471047
{

libsrc/interface/readuser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ namespace netgen
301301
in >> name;
302302
cout << IM(3) << len << " element are in group " << name << endl;
303303
int hi, index;
304-
int fdnr, ednr;
304+
int fdnr=-1, ednr=-1;
305305

306306
in >> hi >> index >> hi >> hi;
307307
int codim = get<1>(element_map[index]);
@@ -712,7 +712,7 @@ namespace netgen
712712
if(!UserFormatRegister::HaveFormat(format))
713713
throw Exception("Unknown format: " + format);
714714

715-
const auto & entry = UserFormatRegister::Get(format);
715+
const auto entry = UserFormatRegister::Get(format);
716716
if(!entry.read)
717717
throw Exception("Reading format " + format + " is not implemented");
718718

libsrc/interface/rw_medit.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ void ReadMeditFormat (Mesh & mesh, const filesystem::path & filename, map<tuple<
5353
for([[maybe_unused]] auto k : Range(nvert)) {
5454
for(auto i : Range(dim))
5555
fin >> p[i];
56-
fin >> index;
57-
mesh.AddPoint(p);
56+
fin >> index;
57+
mesh.AddPoint(p);
5858
}
5959
}
6060
else if(token == "Edges") {
@@ -64,10 +64,10 @@ void ReadMeditFormat (Mesh & mesh, const filesystem::path & filename, map<tuple<
6464
for([[maybe_unused]] auto k : Range(nedge)) {
6565
for(auto i : Range(2))
6666
fin >> seg[i];
67-
fin >> seg.edgenr;
68-
seg.edgenr = getIndex(1, seg.edgenr);
69-
seg.si = seg.edgenr;
70-
mesh.AddSegment(seg);
67+
fin >> seg.edgenr;
68+
seg.edgenr = getIndex(1, seg.edgenr);
69+
seg.si = seg.edgenr;
70+
mesh.AddSegment(seg);
7171
}
7272
}
7373
else if(token == "Triangles") {
@@ -77,9 +77,9 @@ void ReadMeditFormat (Mesh & mesh, const filesystem::path & filename, map<tuple<
7777
for([[maybe_unused]] auto k : Range(ntrig)) {
7878
for(auto i : Range(3))
7979
fin >> sel[i];
80-
fin >> index;
81-
sel.SetIndex(getIndex(2, index));
82-
mesh.AddSurfaceElement(sel);
80+
fin >> index;
81+
sel.SetIndex(getIndex(2, index));
82+
mesh.AddSurfaceElement(sel);
8383
}
8484
}
8585
else if(token == "Tetrahedra") {
@@ -89,10 +89,10 @@ void ReadMeditFormat (Mesh & mesh, const filesystem::path & filename, map<tuple<
8989
for([[maybe_unused]] auto k : Range(ntet)) {
9090
for(auto i : Range(4))
9191
fin >> el[i];
92-
fin >> index;
93-
el.SetIndex(getIndex(3, index));
94-
el.Invert();
95-
mesh.AddVolumeElement(el);
92+
fin >> index;
93+
el.SetIndex(getIndex(3, index));
94+
el.Invert();
95+
mesh.AddVolumeElement(el);
9696
}
9797
}
9898
else if(token == "Corners") {

libsrc/interface/writeuser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ bool WriteUserFormat (const string & format,
3939
if(!UserFormatRegister::HaveFormat(format))
4040
return true;
4141

42-
const auto & entry = UserFormatRegister::Get(format);
42+
const auto entry = UserFormatRegister::Get(format);
4343
if(!entry.write)
4444
return true;
4545

libsrc/linalg/densemat.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace netgen
4949
{
5050
data = NULL; height = width = 0;
5151
SetSize (m2.Height(), m2.Width());
52-
if (Height()*Width())
52+
if (Height() && Width())
5353
memcpy (data, m2.data, sizeof(double) * (Height() * Width()));
5454
}
5555

@@ -70,7 +70,7 @@ namespace netgen
7070

7171
delete[] data;
7272

73-
if (h*w)
73+
if (h && w)
7474
data = new double[h*w];
7575
else
7676
data = NULL;

libsrc/meshing/boundarylayer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -788,9 +788,9 @@ namespace netgen
788788
if(fabs(mat.Det()) > 1e-6)
789789
break;
790790
}
791-
int maxpos1;
792-
int maxpos2;
793-
double val = 0;
791+
int maxpos1 = 0;
792+
int maxpos2 = 1;
793+
double val = ns[0] * ns[1];
794794
for (auto i : Range(ns))
795795
{
796796
for (auto j : Range(i + 1, ns.Size()))

libsrc/meshing/improve3.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,8 @@ double MeshOptimize3d :: SwapImproveEdge (
10661066
bad3 += GetLegalPenalty();
10671067
}
10681068

1069-
bool swap2, swap3;
1069+
bool swap2=false;
1070+
bool swap3=false;
10701071

10711072
if (goal == OPT_CONFORM)
10721073
{
@@ -2608,7 +2609,7 @@ double MeshOptimize3d :: SplitImprove2Element (
26082609
// search for very flat tets, with two disjoint edges nearly crossing, like a rectangle with diagonals
26092610
int minedge = -1;
26102611
double mindist = 1e99;
2611-
double minlam0, minlam1;
2612+
double minlam0=0, minlam1=0;
26122613

26132614
for (int i : Range(3))
26142615
{

0 commit comments

Comments
 (0)