Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export CXX
##########################################################################
# Enable optimisation / debugging
# GADGET_OPTIM = -D DEBUG
GADGET_OPTIM = -O3 -march=native -Wall
GADGET_OPTIM = -O3 -march=native -Wall -Werror -pedantic -flto=10

##########################################################################
# Detect platform
Expand Down
2 changes: 1 addition & 1 deletion src/addresskeepervector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ void AddressKeeperVector::resize() {
if (v == 0) {
v = new AddressKeeper[1];
} else {
AddressKeeper* vnew = new AddressKeeper[size + 1];
AddressKeeper* vnew = new AddressKeeper[(unsigned)(max(0, size + 1))];
for (i = 0; i < size; i++)
vnew[i] = v[i];
delete[] v;
Expand Down
2 changes: 1 addition & 1 deletion src/formulavector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void FormulaVector::resize(int addsize, Keeper* keeper) {
size = addsize;
v = new Formula[size];
} else {
Formula* vnew = new Formula[size + addsize];
Formula* vnew = new Formula[(unsigned)(max(0, size + addsize))];
for (i = 0; i < size; i++)
v[i].Interchange(vnew[i], keeper);
delete[] v;
Expand Down
4 changes: 2 additions & 2 deletions src/modelvariablevector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void ModelVariableVector::resize(int addsize, Keeper* const keeper) {
size = addsize;
v = new ModelVariable[size];
} else {
ModelVariable* vnew = new ModelVariable[addsize + size];
ModelVariable* vnew = new ModelVariable[(unsigned)(max(0, addsize + size))];
for (i = 0; i < size; i++)
v[i].Interchange(vnew[i], keeper);
delete[] v;
Expand All @@ -44,7 +44,7 @@ void ModelVariableVector::resize(const ModelVariable& mvar, Keeper* const keeper
if (v == 0) {
v = new ModelVariable[1];
} else {
ModelVariable* vnew = new ModelVariable[size + 1];
ModelVariable* vnew = new ModelVariable[(unsigned)(max(0, size + 1))];
for (i = 0; i < size; i++)
v[i].Interchange(vnew[i], keeper);
delete[] v;
Expand Down
2 changes: 1 addition & 1 deletion src/parametervector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void ParameterVector::resize(Parameter& value) {
if (v == 0) {
v = new Parameter[1];
} else {
Parameter* vnew = new Parameter[size + 1];
Parameter* vnew = new Parameter[(unsigned)(max(0, size + 1))];
for (i = 0; i < size; i++)
vnew[i] = v[i];
delete[] v;
Expand Down
2 changes: 1 addition & 1 deletion src/popinfoindexvector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void PopInfoIndexVector::resize(int addsize, int lower, PopInfo initial) {
v[i] = initial;

} else {
PopInfo* vnew = new PopInfo[size + addsize];
PopInfo* vnew = new PopInfo[(unsigned)(max(0, size + addsize))];
for (i = 0; i < size; i++)
vnew[i + minpos - lower] = v[i];
delete[] v;
Expand Down
4 changes: 2 additions & 2 deletions src/popinfovector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void PopInfoVector::resizeBlank(int addsize) {
size = addsize;
v = new PopInfo[size];
} else {
PopInfo* vnew = new PopInfo[addsize + size];
PopInfo* vnew = new PopInfo[(unsigned)(max(0, addsize + size))];
for (i = 0; i < size; i++)
vnew[i] = v[i];
delete[] v;
Expand All @@ -52,7 +52,7 @@ void PopInfoVector::resize(PopInfo value) {
if (v == 0) {
v = new PopInfo[1];
} else {
PopInfo* vnew = new PopInfo[size + 1];
PopInfo* vnew = new PopInfo[(unsigned)(max(0, size + 1))];
for (i = 0; i < size; i++)
vnew[i] = v[i];
delete[] v;
Expand Down
4 changes: 2 additions & 2 deletions src/popratiovector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void PopRatioVector::resize(PopRatio value) {
if (v == 0) {
v = new PopRatio[1];
} else {
PopRatio* vnew = new PopRatio[size + 1];
PopRatio* vnew = new PopRatio[(unsigned)(max(0, size + 1))];
for (i = 0; i < size; i++)
vnew[i] = v[i];
delete[] v;
Expand All @@ -50,7 +50,7 @@ void PopRatioVector::resize(double* num, double rat) {
if (v == 0) {
v = new PopRatio[1];
} else {
PopRatio* vnew = new PopRatio[size + 1];
PopRatio* vnew = new PopRatio[(unsigned)(max(0, size + 1))];
for (i = 0; i < size; i++)
vnew[i] = v[i];
delete[] v;
Expand Down
4 changes: 2 additions & 2 deletions src/timevariablevector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void TimeVariableVector::resize(int addsize, Keeper* const keeper) {
size = addsize;
v = new TimeVariable[size];
} else {
TimeVariable* vnew = new TimeVariable[addsize + size];
TimeVariable* vnew = new TimeVariable[(unsigned)(max(0, addsize + size))];
for (i = 0; i < size; i++)
v[i].Interchange(vnew[i], keeper);
delete[] v;
Expand All @@ -44,7 +44,7 @@ void TimeVariableVector::resize(const TimeVariable& tvar, Keeper* const keeper)
if (v == 0) {
v = new TimeVariable[1];
} else {
TimeVariable* vnew = new TimeVariable[size + 1];
TimeVariable* vnew = new TimeVariable[(unsigned)(max(0, size + 1))];
for (i = 0; i < size; i++)
v[i].Interchange(vnew[i], keeper);
delete[] v;
Expand Down