Skip to content

Remove using enum statements for C++17 compatibility #3338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Steven-Roberts wants to merge 1 commit into from
+9 −13
Closed

Remove using enum statements for C++17 compatibility #3338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions src/mesh/impls/bout/boutmesh.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2439,14 +2439,13 @@ void BoutMesh::overlapHandleMemory(BoutMesh* yup, BoutMesh* ydown, BoutMesh* xin
int BoutMesh::pack_data(const std::vector<Field*>& var_list, int xge, int xlt, int yge,
int ylt, BoutReal* buffer) const {

using enum Field::FieldType;
int len = 0;
const int zge = 0;
const int zlt = LocalNz;

for (const auto& var : var_list) {
switch (var->field_type()) {
case field3d: {
case Field::FieldType::field3d: {
const auto* var3d_ref_ptr = dynamic_cast<Field3D*>(var);
ASSERT0(var3d_ref_ptr != nullptr);
const auto& var3d_ref = *var3d_ref_ptr;
Expand All @@ -2460,7 +2459,7 @@ int BoutMesh::pack_data(const std::vector<Field*>& var_list, int xge, int xlt, i
}
break;
}
case field2d: {
case Field::FieldType::field2d: {
const auto* var2d_ref_ptr = dynamic_cast<Field2D*>(var);
ASSERT0(var2d_ref_ptr != nullptr);
const auto& var2d_ref = *var2d_ref_ptr;
Expand All @@ -2472,7 +2471,7 @@ int BoutMesh::pack_data(const std::vector<Field*>& var_list, int xge, int xlt, i
}
break;
}
case fieldperp: {
case Field::FieldType::fieldperp: {
const auto* varperp_ref_ptr = dynamic_cast<FieldPerp*>(var);
ASSERT0(varperp_ref_ptr != nullptr);
const auto& varperp_ref = *varperp_ref_ptr;
Expand All @@ -2493,14 +2492,13 @@ int BoutMesh::pack_data(const std::vector<Field*>& var_list, int xge, int xlt, i
int BoutMesh::unpack_data(const std::vector<Field*>& var_list, int xge, int xlt, int yge,
int ylt, const BoutReal* buffer) const {

using enum Field::FieldType;
int len = 0;
const int zge = 0;
const int zlt = LocalNz;

for (const auto& var : var_list) {
switch (var->field_type()) {
case field3d: {
case Field::FieldType::field3d: {
auto* var3d_ref_ptr = dynamic_cast<Field3D*>(var);
ASSERT0(var3d_ref_ptr != nullptr);
auto& var3d_ref = *var3d_ref_ptr;
Expand All @@ -2514,7 +2512,7 @@ int BoutMesh::unpack_data(const std::vector<Field*>& var_list, int xge, int xlt,
}
break;
}
case field2d: {
case Field::FieldType::field2d: {
auto* var2d_ref_ptr = dynamic_cast<Field2D*>(var);
ASSERT0(var2d_ref_ptr != nullptr);
auto& var2d_ref = *var2d_ref_ptr;
Expand All @@ -2526,7 +2524,7 @@ int BoutMesh::unpack_data(const std::vector<Field*>& var_list, int xge, int xlt,
}
break;
}
case fieldperp: {
case Field::FieldType::fieldperp: {
auto* varperp_ref_ptr = dynamic_cast<FieldPerp*>(var);
ASSERT0(varperp_ref_ptr != nullptr);
auto& varperp_ref = *varperp_ref_ptr;
Expand Down
8 changes: 3 additions & 5 deletions src/mesh/mesh.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,22 +380,20 @@ int Mesh::msg_len(const std::vector<Field*>& var_list, int xge, int xlt, int yge
int ylt) const {
int len = 0;

using enum Field::FieldType;

const auto x_length = xlt - xge;
const auto y_length = ylt - yge;
const auto z_length = LocalNz;

/// Loop over variables
for (const auto& var : var_list) {
switch (var->field_type()) {
case field3d:
case Field::FieldType::field3d:
len += x_length * y_length * z_length * var->elementSize();
break;
case field2d:
case Field::FieldType::field2d:
len += x_length * y_length * var->elementSize();
break;
case fieldperp:
case Field::FieldType::fieldperp:
len += x_length * z_length * var->elementSize();
break;
}
Expand Down
Loading