Skip to content

fix enum for compile with gcc/4.9.2 #168

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

Merged
merged 2 commits into from
Aug 14, 2018
Merged

fix enum for compile with gcc/4.9.2 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bfcef9
fix enum for compile with gcc/4.9.2
jacobmerson Aug 13, 2018
209290c
fix test case
jacobmerson Aug 13, 2018
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
13 changes: 7 additions & 6 deletions apf/apfConvert.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <map>
#include <pcu_util.h>
#include <iostream>
#include <cstdlib>

namespace apf {

Expand Down Expand Up @@ -231,17 +232,17 @@ class Converter
int* intData;
long* lngData;
switch (tagType) {
case apf::Mesh::TagType::DOUBLE:
case apf::Mesh::DOUBLE:
dblData = new double[tagSize];
inMesh->getDoubleTag(e, in, dblData);
outMesh->setDoubleTag(newFromOld[e], out, dblData);
break;
case apf::Mesh::TagType::INT:
case apf::Mesh::INT:
intData = new int[tagSize];
inMesh->getIntTag(e, in, intData);
outMesh->setIntTag(newFromOld[e], out, intData);
break;
case apf::Mesh::TagType::LONG:
case apf::Mesh::LONG:
lngData = new long[tagSize];
inMesh->getLongTag(e, in, lngData);
outMesh->setLongTag(newFromOld[e], out, lngData);
Expand Down Expand Up @@ -319,13 +320,13 @@ class Converter
if (!outMesh->findTag(tagName)) {
apf::MeshTag* out = NULL;
switch (tagType) {
case apf::Mesh::TagType::DOUBLE:
case apf::Mesh::DOUBLE:
out = outMesh->createDoubleTag(tagName, tagSize);
break;
case apf::Mesh::TagType::INT:
case apf::Mesh::INT:
out = outMesh->createIntTag(tagName, tagSize);
break;
case apf::Mesh::TagType::LONG:
case apf::Mesh::LONG:
out = outMesh->createLongTag(tagName, tagSize);
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion test/verify_convert.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ apf::Mesh2* createMesh()
m->createVertex(NULL, apf::Vector3(0, 0, 0), apf::Vector3(0, 0, 0));
verts[1] =
m->createVertex(NULL, apf::Vector3(1, 0, 0), apf::Vector3(1, 0, 0));
m->createEntity(apf::Mesh::Type::EDGE, NULL, verts);
m->createEntity(apf::Mesh::EDGE, NULL, verts);
return m;
}
class twox : public apf::Function {
Expand Down