use tuple -> std::tuple

This commit is contained in:
Matthias Hochsteger 2021-05-30 18:43:09 +02:00
parent eb87741b70
commit e721d250f8
3 changed files with 5 additions and 5 deletions

View File

@ -358,8 +358,8 @@ namespace netgen
int GetParentSElement (int ei) const; int GetParentSElement (int ei) const;
bool HasParentEdges() const; bool HasParentEdges() const;
tuple<int, std::array<int,3>> GetParentEdges (int enr) const; std::tuple<int, std::array<int,3>> GetParentEdges (int enr) const;
tuple<int, std::array<int,4>> GetParentFaces (int fnr) const; std::tuple<int, std::array<int,4>> GetParentFaces (int fnr) const;
int GetNIdentifications() const; int GetNIdentifications() const;
int GetIdentificationType(int idnr) const; int GetIdentificationType(int idnr) const;

View File

@ -446,7 +446,7 @@ namespace netgen
pnum[cnt++] = val; pnum[cnt++] = val;
return *this; return *this;
} }
Element2d & operator= (initializer_list<tuple<PointIndex,PointGeomInfo>> list) Element2d & operator= (initializer_list<std::tuple<PointIndex,PointGeomInfo>> list)
{ {
size_t cnt = 0; size_t cnt = 0;
for (auto val : list) for (auto val : list)

View File

@ -195,10 +195,10 @@ public:
private: private:
Array<tuple<int, std::array<int,3>>> parent_edges; Array<std::tuple<int, std::array<int,3>>> parent_edges;
void BuildParentEdges (); void BuildParentEdges ();
Array<tuple<int, std::array<int,4>>> parent_faces; Array<std::tuple<int, std::array<int,4>>> parent_faces;
void BuildParentFaces (); void BuildParentFaces ();
public: public:
auto GetParentEdges (int enr) const { return parent_edges[enr]; } auto GetParentEdges (int enr) const { return parent_edges[enr]; }