Commit 35848f56 authored by Sean McBride's avatar Sean McBride
Browse files

Fixed more clang warnings about 'rule of three' violations

These classes need their dtor, and so I've provided
declarations to suppress the implicit creation of
copy ctors and copy assignments.

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