summaryrefslogtreecommitdiff
path: root/rsc/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /rsc/inc
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'rsc/inc')
-rw-r--r--rsc/inc/rscarray.hxx6
-rw-r--r--rsc/inc/rscclass.hxx2
-rw-r--r--rsc/inc/rscconst.hxx2
-rw-r--r--rsc/inc/rsccont.hxx2
-rw-r--r--rsc/inc/rscdef.hxx2
5 files changed, 7 insertions, 7 deletions
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index d769d21e743b..cd55d07679e6 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -33,7 +33,7 @@ protected:
public:
RSCINST aInst;
RscInstNode( sal_uInt32 nId );
- ~RscInstNode();
+ virtual ~RscInstNode();
virtual sal_uInt32 GetId() const SAL_OVERRIDE;
RscInstNode * Left() const { return (RscInstNode *)pLeft ; };
RscInstNode * Right() const{ return (RscInstNode *)pRight ; };
@@ -63,7 +63,7 @@ protected:
public:
RscArray( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper, RscEnum * pTypeClass );
- ~RscArray();
+ virtual ~RscArray();
virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE;
void SetTypeClass( RscEnum * pClass ) { pTypeClass = pClass; }
@@ -99,7 +99,7 @@ class RscClassArray : public RscArray
public:
RscClassArray( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper, RscEnum * pTypeClass );
- ~RscClassArray();
+ virtual ~RscClassArray();
virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab,
const RscId & aId, const char * ) SAL_OVERRIDE;
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 4822909c4130..6db763227d8a 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -57,7 +57,7 @@ protected:
sal_uInt32 nTupelIdx, RscTypCont * pTC );
public:
RscClass( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
- ~RscClass();
+ virtual ~RscClass();
virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE;
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index fa773250ee3d..cc76a3a79493 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -36,7 +36,7 @@ protected:
sal_uInt32 nEntries; // Anzahle der Eintraege im Feld
public:
RscConst( Atom nId, sal_uInt32 nTypId );
- ~RscConst();
+ virtual ~RscConst();
virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE;
sal_uInt32 GetEntryCount() const { return nEntries; }
// Die erlaubten Werte werden gesetzt
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 0c02d3af707a..3e1f51b2e721 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -58,7 +58,7 @@ public:
RscBaseCont( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper = NULL,
bool bNoId = true );
- ~RscBaseCont();
+ virtual ~RscBaseCont();
virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE;
void SetTypeClass( RscTop * pClass, RscTop * pClass1 = NULL )
{
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 3ab50765bd57..fafd5d93f746 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -127,7 +127,7 @@ protected:
sal_Int32 lDefId );
RscDefine( sal_uLong lFileKey, const OString& rDefName,
RscExpression * pExpression );
- ~RscDefine();
+ virtual ~RscDefine();
void IncRef(){ nRefCount++; }
sal_uInt32 GetRefCount() const { return nRefCount; }
void DecRef();