Commit d207a28d authored by Douglas Serson's avatar Douglas Serson

Fix MeshGen compilation issue

parent db524fe1
......@@ -73,7 +73,7 @@ public:
const NekDouble min,
const NekDouble max,
const NekDouble eps,
const string uds)
const std::string uds)
: m_minDelta(min), m_maxDelta(max), m_eps(eps), m_cad(cad),
m_verbose(ver), m_udsfile(uds)
{
......@@ -180,7 +180,7 @@ private:
/// number of octants made, used for id index
int m_numoct;
string m_udsfile;
std::string m_udsfile;
};
typedef boost::shared_ptr<Octree> OctreeSharedPtr;
......
......@@ -87,8 +87,8 @@ public:
friend class MemoryManager<OptiFace>;
OptiFace(Array<OneD, Array<OneD, NekDouble> > a,
map<pair<int, int>, NekDouble> w,
set<pair<int, int> > sp,
std::map<std::pair<int, int>, NekDouble> w,
std::set<std::pair<int, int> > sp,
CADSurfSharedPtr su)
{
uv = a;
......@@ -116,8 +116,8 @@ public:
private:
CADSurfSharedPtr s;
map<pair<int, int>, NekDouble> z;
set<pair<int, int> > spring;
std::map<std::pair<int, int>, NekDouble> z;
std::set<std::pair<int, int> > spring;
Array<OneD, Array<OneD, NekDouble> > uv;
int ni, np, nq;
};
......
......@@ -61,7 +61,7 @@ public:
private:
NekDouble m_minDelta, m_maxDelta, m_eps, m_blthick;
int m_order;
string m_CADName, m_udsName;
std::string m_CADName, m_udsName;
bool m_makeBL, m_writeoctree;
};
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment