Commit b55bb071 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell Committed by Code Review
Browse files

Merge topic 'implicit-copy-constructor' into master

632a9242 Removed explicit destructors for vtkAtom and vtkBond
9007d128 Removed assignment operator from vtkQuaternion
parents af26149c 632a9242
...@@ -27,11 +27,6 @@ vtkAtom::vtkAtom(vtkMolecule *parent, vtkIdType id) ...@@ -27,11 +27,6 @@ vtkAtom::vtkAtom(vtkMolecule *parent, vtkIdType id)
assert(id < parent->GetNumberOfAtoms()); assert(id < parent->GetNumberOfAtoms());
} }
//----------------------------------------------------------------------------
vtkAtom::~vtkAtom()
{
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkAtom::PrintSelf(ostream &os, vtkIndent indent) void vtkAtom::PrintSelf(ostream &os, vtkIndent indent)
{ {
......
...@@ -28,8 +28,6 @@ class vtkVector3f; ...@@ -28,8 +28,6 @@ class vtkVector3f;
class VTKCOMMONDATAMODEL_EXPORT vtkAtom class VTKCOMMONDATAMODEL_EXPORT vtkAtom
{ {
public: public:
~vtkAtom();
void PrintSelf(ostream &os, vtkIndent indent); void PrintSelf(ostream &os, vtkIndent indent);
// Description: // Description:
......
...@@ -31,11 +31,6 @@ vtkBond::vtkBond(vtkMolecule *parent, vtkIdType id, ...@@ -31,11 +31,6 @@ vtkBond::vtkBond(vtkMolecule *parent, vtkIdType id,
assert(endAtomId < parent->GetNumberOfAtoms()); assert(endAtomId < parent->GetNumberOfAtoms());
} }
//----------------------------------------------------------------------------
vtkBond::~vtkBond()
{
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkBond::PrintSelf(ostream &os, vtkIndent indent) void vtkBond::PrintSelf(ostream &os, vtkIndent indent)
{ {
......
...@@ -27,7 +27,6 @@ class vtkMolecule; ...@@ -27,7 +27,6 @@ class vtkMolecule;
class VTKCOMMONDATAMODEL_EXPORT vtkBond class VTKCOMMONDATAMODEL_EXPORT vtkBond
{ {
public: public:
~vtkBond();
void PrintSelf(ostream &os, vtkIndent indent); void PrintSelf(ostream &os, vtkIndent indent);
// Description: // Description:
......
...@@ -196,10 +196,6 @@ public: ...@@ -196,10 +196,6 @@ public:
vtkQuaternion<T> InnerPoint(const vtkQuaternion<T>& q1, vtkQuaternion<T> InnerPoint(const vtkQuaternion<T>& q1,
const vtkQuaternion<T>& q2) const; const vtkQuaternion<T>& q2) const;
// Description:
// Performs the copy of a quaternion of the same basic type.
void operator=(const vtkQuaternion<T>& q);
// Description: // Description:
// Performs addition of quaternion of the same basic type. // Performs addition of quaternion of the same basic type.
vtkQuaternion<T> operator+(const vtkQuaternion<T>& q) const; vtkQuaternion<T> operator+(const vtkQuaternion<T>& q) const;
......
...@@ -273,16 +273,6 @@ vtkQuaternion<T>::SetRotationAngleAndAxis (const T& angle, ...@@ -273,16 +273,6 @@ vtkQuaternion<T>::SetRotationAngleAndAxis (const T& angle,
} }
} }
//----------------------------------------------------------------------------
template<typename T>
void vtkQuaternion<T>::operator=(const vtkQuaternion<T>& q)
{
for (int i = 0; i < 4; ++i)
{
this->Data[i] = q[i];
}
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
template<typename T> template<typename T>
vtkQuaternion<T> vtkQuaternion<T>::operator+(const vtkQuaternion<T>& q) const vtkQuaternion<T> vtkQuaternion<T>::operator+(const vtkQuaternion<T>& q) const
......
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