From 1a439b02d000ea6b2bfe97e73c77c07a9cc361b2 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 23 Jun 2009 12:14:03 +0100
Subject: [PATCH] Sorted warning message about the need for virtual destructor.
---
.../functions/Polynomial/Polynomial.C | 29 -------------------
.../functions/Polynomial/Polynomial.H | 18 ------------
.../directMappedPatchBase.H | 12 ++++----
.../directMappedPolyPatch.H | 5 ++--
.../directMappedWallPolyPatch.H | 5 ++--
.../icoPolynomial/icoPolynomial.H | 2 --
6 files changed, 10 insertions(+), 61 deletions(-)
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
index b842493eef9..8f3381ea45a 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
@@ -69,16 +69,6 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
}
-template<int PolySize>
-Foam::Polynomial<PolySize>::Polynomial(const Polynomial<PolySize>& poly)
-:
- VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly),
- name_(poly.name_),
- logActive_(poly.logActive_),
- logCoeff_(poly.logCoeff_)
-{}
-
-
template<int PolySize>
Foam::Polynomial<PolySize>::Polynomial
(
@@ -93,13 +83,6 @@ Foam::Polynomial<PolySize>::Polynomial
{}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<int PolySize>
-Foam::Polynomial<PolySize>::~Polynomial()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<int PolySize>
@@ -210,16 +193,4 @@ Foam::Polynomial<PolySize>::integrateMinus1(const scalar intConstant)
}
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-template<int PolySize>
-void Foam::Polynomial<PolySize>::operator=(const Polynomial<PolySize>& poly)
-{
- name_ = poly.name_;
- VectorSpace<Polynomial<PolySize>, scalar, PolySize>::operator=(poly);
- logActive_ = poly.logActive_;
- logCoeff_ = poly.logCoeff_;
-}
-
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
index 89ecb9c1840..85d41fa8805 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
@@ -52,7 +52,6 @@ SourceFiles
#include "scalar.H"
#include "Ostream.H"
#include "VectorSpace.H"
-#include "Vector.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -81,8 +80,6 @@ class Polynomial
:
public VectorSpace<Polynomial<PolySize>, scalar, PolySize>
{
-private:
-
// Private data
//- Polynomial name
@@ -101,9 +98,6 @@ public:
typedef Polynomial<PolySize+1> intPolyType;
- //- Run-time type information
- TypeName("Polynomial")
-
// Constructors
@@ -113,17 +107,10 @@ public:
//- Construct from name and Istream
Polynomial(const word& name, Istream& is);
- //- Copy constructor
- Polynomial(const Polynomial& poly);
-
//- Copy constructor with name
Polynomial(const word& name, const Polynomial& poly);
- //- Destructor
- ~Polynomial();
-
-
// Member Functions
// Access
@@ -155,11 +142,6 @@ public:
scalar integrateLimits(const scalar x1, const scalar x2) const;
- // Member operators
-
- void operator=(const Polynomial& poly);
-
-
//- Ostream Operator
friend Ostream& operator<< <PolySize>
(
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
index 1a476f66a9e..a3d936757ea 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
@@ -105,6 +105,7 @@ private:
// - schedule
mutable autoPtr<mapDistribute> mapPtr_;
+
// Private Member Functions
//- Collect single list of samples and originating processor+face.
@@ -162,7 +163,7 @@ private:
public:
//- Runtime type information
- ClassName("directMappedPatchBase");
+ TypeName("directMappedPatchBase");
// Constructors
@@ -177,15 +178,14 @@ public:
directMappedPatchBase(const polyPatch&, const directMappedPatchBase&);
- // Destructor
-
- ~directMappedPatchBase();
-
- void clearOut();
+ //- Destructor
+ virtual ~directMappedPatchBase();
// Member functions
+ void clearOut();
+
//- What to sample
const sampleMode& mode() const
{
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
index 522564b3377..fdd4baec85c 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
@@ -151,9 +151,8 @@ public:
}
- // Destructor
-
- ~directMappedPolyPatch();
+ //- Destructor
+ virtual ~directMappedPolyPatch();
// Member functions
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
index 407d62ddda2..457552e4214 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
@@ -158,9 +158,8 @@ public:
}
- // Destructor
-
- ~directMappedWallPolyPatch();
+ //- Destructor
+ virtual ~directMappedWallPolyPatch();
// Member functions
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index b23de491d1b..27190fd833b 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -105,8 +105,6 @@ class icoPolynomial
public:
- TypeName("icoPolynomial")
-
// Constructors
//- Construct from components
--
GitLab