summaryrefslogtreecommitdiff
path: root/store
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /store
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'store')
-rw-r--r--store/source/lockbyte.cxx6
-rw-r--r--store/source/lockbyte.hxx2
-rw-r--r--store/source/object.hxx2
-rw-r--r--store/source/storbase.cxx2
-rw-r--r--store/source/storbase.hxx2
-rw-r--r--store/source/storbios.hxx2
-rw-r--r--store/source/storcach.hxx2
-rw-r--r--store/source/stordir.hxx2
-rw-r--r--store/source/storlckb.hxx2
-rw-r--r--store/source/storpage.hxx2
10 files changed, 12 insertions, 12 deletions
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index 65ac5c3dc947..1251de2b0b6d 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -313,7 +313,7 @@ public:
protected:
/** Destruction.
*/
- virtual ~FileLockBytes();
+ virtual ~FileLockBytes() override;
};
} // namespace store
@@ -541,7 +541,7 @@ public:
protected:
/* Destruction.
*/
- virtual ~MappedLockBytes();
+ virtual ~MappedLockBytes() override;
};
} // namespace store
@@ -679,7 +679,7 @@ public:
protected:
/** Destruction.
*/
- virtual ~MemoryLockBytes();
+ virtual ~MemoryLockBytes() override;
};
} // namespace store
diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index c9aa2a526905..1a864ad1575b 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -104,7 +104,7 @@ public:
storeError flush();
protected:
- virtual ~ILockBytes() {}
+ virtual ~ILockBytes() override {}
private:
/** Implementation (abstract).
diff --git a/store/source/object.hxx b/store/source/object.hxx
index d59d9485adba..6d8c1303dc01 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -46,7 +46,7 @@ public:
protected:
/** Destruction.
*/
- virtual ~OStoreObject() {}
+ virtual ~OStoreObject() override {}
private:
/** The IStoreHandle TypeId.
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index 2515de508d78..4bdc5dd5fe02 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -89,7 +89,7 @@ public:
protected:
/** Destruction.
*/
- virtual ~Allocator_Impl();
+ virtual ~Allocator_Impl() override;
private:
/** Representation.
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 6606f5507570..b861047c56bd 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -432,7 +432,7 @@ struct PageData
rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize);
protected:
- virtual ~Allocator() {}
+ virtual ~Allocator() override {}
private:
/** Implementation (abstract).
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index ebb9ef65278b..336a37ff0515 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -117,7 +117,7 @@ public:
protected:
/** Destruction (OReference).
*/
- virtual ~OStorePageBIOS();
+ virtual ~OStorePageBIOS() override;
private:
/** Representation.
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 099339778205..b9febd35f213 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -99,7 +99,7 @@ public:
protected:
// Destruction
- virtual ~PageCache();
+ virtual ~PageCache() override;
};
/*========================================================================
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index fb7981dbc205..09bdfe7f5ccd 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -75,7 +75,7 @@ public:
protected:
/** Destruction.
*/
- virtual ~OStoreDirectory_Impl();
+ virtual ~OStoreDirectory_Impl() override;
private:
/** IStoreHandle TypeId.
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 8bcf731045a2..16a05cc1bb9e 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -99,7 +99,7 @@ public:
protected:
/** Destruction (OReference).
*/
- virtual ~OStoreLockBytes();
+ virtual ~OStoreLockBytes() override;
private:
/** IStoreHandle TypeId.
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 76d4a5bf3d58..136e527b3efa 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -92,7 +92,7 @@ public:
protected:
/** Destruction.
*/
- virtual ~OStorePageManager();
+ virtual ~OStorePageManager() override;
private:
/** Implementation.