From 670d7d0e2285b04c07aee05adad58b78bc8464ac Mon Sep 17 00:00:00 2001 From: Simon Richards Date: Fri, 28 Feb 2020 22:35:23 +0000 Subject: [PATCH] Fix for enumeration values not explicitly handled in switch statements --- src/main.cpp | 2 ++ src/particle.cpp | 2 ++ src/scattdata.cpp | 2 ++ src/state_point.cpp | 2 ++ src/volume_calc.cpp | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index dea347ce4b..ccd2005bf5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,6 +43,8 @@ int main(int argc, char* argv[]) { case RunMode::VOLUME: err = openmc_calculate_volumes(); break; + default: + break; } if (err) fatal_error(openmc_err_msg); diff --git a/src/particle.cpp b/src/particle.cpp index ea0d03cd01..5f9713941e 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -675,6 +675,8 @@ Particle::write_restart() const case RunMode::PARTICLE: write_dataset(file_id, "run_mode", "particle restart"); break; + default: + break; } write_dataset(file_id, "id", id_); write_dataset(file_id, "type", static_cast(type_)); diff --git a/src/scattdata.cpp b/src/scattdata.cpp index 11e5c4c4c8..4fd7a7b7c4 100644 --- a/src/scattdata.cpp +++ b/src/scattdata.cpp @@ -227,6 +227,8 @@ ScattData::get_xs(MgxsType xstype, int gin, const int* gout, const double* mu) fatal_error("Invalid call to get_xs"); } break; + default: + break; } return val; } diff --git a/src/state_point.cpp b/src/state_point.cpp index 503b1354e6..d077590365 100644 --- a/src/state_point.cpp +++ b/src/state_point.cpp @@ -87,6 +87,8 @@ openmc_statepoint_write(const char* filename, bool* write_source) case RunMode::EIGENVALUE: write_dataset(file_id, "run_mode", "eigenvalue"); break; + default: + break; } write_attribute(file_id, "photon_transport", settings::photon_transport); write_dataset(file_id, "n_particles", settings::n_particles); diff --git a/src/volume_calc.cpp b/src/volume_calc.cpp index 8cae7743d3..97594c3b5d 100644 --- a/src/volume_calc.cpp +++ b/src/volume_calc.cpp @@ -295,6 +295,8 @@ std::vector VolumeCalculation::execute() const case TriggerMetric::variance: val = result.volume[1] * result.volume[1]; break; + default: + break; } // update max if entry is valid if (val > 0.0) { trigger_val = std::max(trigger_val, val); } @@ -374,6 +376,8 @@ void VolumeCalculation::to_hdf5(const std::string& filename, case TriggerMetric::relative_error: trigger_str = "rel_err"; break; + default: + break; } write_attribute(file_id, "trigger_type", trigger_str); } else {