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

@ -82,10 +82,10 @@ class pqFoamReaderControls
void fireCommand(vtkSMIntVectorProperty* prop, int val);
//- Disallow default bitwise copy construct
//- No copy construct
pqFoamReaderControls(const pqFoamReaderControls&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const pqFoamReaderControls&) = delete;

View File

@ -222,10 +222,10 @@ protected:
private:
//- Disallow default bitwise copy construct
//- No copy construct
vtkPVFoamReader(const vtkPVFoamReader&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const vtkPVFoamReader&) = delete;
//- Add/remove patch names to/from the view

View File

@ -78,10 +78,10 @@ class pqFoamBlockMeshControls
void updateParts();
//- Disallow default bitwise copy construct
//- No copy construct
pqFoamBlockMeshControls(const pqFoamBlockMeshControls&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const pqFoamBlockMeshControls&) = delete;

View File

@ -148,10 +148,10 @@ protected:
private:
//- Disallow default bitwise copy construct
//- No copy construct
vtkPVblockMeshReader(const vtkPVblockMeshReader&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const vtkPVblockMeshReader&) = delete;
//- Add/remove patch names to/from the view

View File

@ -227,7 +227,7 @@ void Foam::vtkPVFoam::updateInfoLagrangian
for (const instant& t : dbPtr_().times())
{
names.insertMany
names.insert
(
readDir
(

View File

@ -141,10 +141,10 @@ class vtkPVblockMesh
void convertMeshCorners(vtkMultiBlockDataSet*, int& blockNo);
//- Disallow default bitwise copy construct
//- No copy construct
vtkPVblockMesh(const vtkPVblockMesh&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const vtkPVblockMesh&) = delete;