Commit fd7fdb2e authored by Sean McBride's avatar Sean McBride Committed by Code Review
Browse files

Merge topic 'more-rule-of-three' into master

35848f56 Fixed more clang warnings about 'rule of three' violations
parents 24f358cb 35848f56
......@@ -134,6 +134,10 @@ public:
protected:
vtkConditionType ConditionVariable;
private:
vtkSimpleConditionVariable(const vtkSimpleConditionVariable& other); // no copy constructor
vtkSimpleConditionVariable& operator=(const vtkSimpleConditionVariable& rhs); // no copy assignment
};
//ETX
......
......@@ -101,6 +101,10 @@ public:
protected:
vtkCritSecType CritSec;
private:
vtkSimpleCriticalSection(const vtkSimpleCriticalSection& other); // no copy constructor
vtkSimpleCriticalSection& operator=(const vtkSimpleCriticalSection& rhs); // no copy assignment
};
//ETX
......
......@@ -123,6 +123,9 @@ public:
~vtkInstantiatorInitialize();
private:
static unsigned int Count;
private:
vtkInstantiatorInitialize(const vtkInstantiatorInitialize& other); // no copy constructor
vtkInstantiatorInitialize& operator=(const vtkInstantiatorInitialize& rhs); // no copy assignment
};
// This instance will show up in any translation unit that uses
......
......@@ -72,6 +72,10 @@ public:
protected:
friend class vtkSimpleConditionVariable;
vtkMutexType MutexLock;
private:
vtkSimpleMutexLock(const vtkSimpleMutexLock& other); // no copy constructor
vtkSimpleMutexLock& operator=(const vtkSimpleMutexLock& rhs); // no copy assignment
};
//ETX
......
......@@ -31,6 +31,10 @@ class VTKCOMMONCORE_EXPORT vtkOutputWindowCleanup
public:
vtkOutputWindowCleanup();
~vtkOutputWindowCleanup();
private:
vtkOutputWindowCleanup(const vtkOutputWindowCleanup& other); // no copy constructor
vtkOutputWindowCleanup& operator=(const vtkOutputWindowCleanup& rhs); // no copy assignment
};
//ETX
......
......@@ -70,6 +70,10 @@ public:
vtkIdList *Cells; //list of cells in node
void DebugPrintTree( int level, double *leaf_vol, int *minCells,
int *maxCells );
private:
vtkOBBNode(const vtkOBBNode& other); // no copy constructor
vtkOBBNode& operator=(const vtkOBBNode& rhs); // no copy assignment
};
//ETX
//
......
......@@ -58,6 +58,10 @@ class VTKRENDERINGCORE_EXPORT vtkTextRendererCleanup
public:
vtkTextRendererCleanup();
~vtkTextRendererCleanup();
private:
vtkTextRendererCleanup(const vtkTextRendererCleanup& other); // no copy constructor
vtkTextRendererCleanup& operator=(const vtkTextRendererCleanup& rhs); // no copy assignment
};
class VTKRENDERINGCORE_EXPORT vtkTextRenderer: public vtkObject
......
......@@ -38,6 +38,10 @@ class VTKRENDERINGFREETYPE_EXPORT vtkMathTextUtilitiesCleanup
public:
vtkMathTextUtilitiesCleanup();
~vtkMathTextUtilitiesCleanup();
private:
vtkMathTextUtilitiesCleanup(const vtkMathTextUtilitiesCleanup& other); // no copy constructor
vtkMathTextUtilitiesCleanup& operator=(const vtkMathTextUtilitiesCleanup& rhs); // no copy assignment
};
class VTKRENDERINGFREETYPE_EXPORT vtkMathTextUtilities : public vtkObject
......
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