Merge remote-tracking branch 'origin/develop' into develop-pre-release

This commit is contained in:
mattijs
2018-05-31 17:34:16 +01:00
1098 changed files with 4845 additions and 3834 deletions

View File

@ -76,10 +76,10 @@ class mergePolyMesh
// Private Member Functions
//- Disallow default bitwise copy construct
//- No copy construct
mergePolyMesh(const mergePolyMesh&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const mergePolyMesh&) = delete;