Commit c9874270 authored by Chris Cantwell's avatar Chris Cantwell

Merge branch 'fix_NekMesh' into 'master'

re-declaration of i when using intel cc

Closes #193

See merge request nektar/nektar!1114
parents 09689cac db691525
Pipeline #1705 passed with stages
in 114 minutes and 3 seconds
......@@ -19,12 +19,11 @@ v5.0.1
------
**Library**
- Fix incorrect coordinate dimension used in history point filter (!1118)
v5.0.1
------
- Fix compile errors with GCC 9.x (!1108)
v5.0.1
------
**NekMesh**
- Fix compile errors when using intel cc (!1114)
**CI**
- Switched to Gitlab CI (!1120, !1120, !1128, !1129)
- Added checked conversion from double to int in SessionReader (!1113)
......
......@@ -501,13 +501,13 @@ void ProcessProjectCAD::Process()
vector<CADSurfSharedPtr> v2 = (*i)->m_n2->GetCADSurfs();
vector<int> vi1, vi2;
for (int i = 0; i < v1.size();i++)
for (size_t j = 0; j < v1.size(); ++j)
{
vi1.push_back(v1[i]->GetId());
vi1.push_back(v1[j]->GetId());
}
for (int i = 0; i < v2.size();i++)
for (size_t j = 0; j < v2.size(); ++j)
{
vi2.push_back(v2[i]->GetId());
vi2.push_back(v2[j]->GetId());
}
sort(vi1.begin(), vi1.end());
......
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