diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /store | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'store')
-rw-r--r-- | store/source/lockbyte.cxx | 64 | ||||
-rw-r--r-- | store/source/object.hxx | 4 | ||||
-rw-r--r-- | store/source/storbase.cxx | 8 | ||||
-rw-r--r-- | store/source/storcach.cxx | 12 | ||||
-rw-r--r-- | store/source/stordata.hxx | 12 | ||||
-rw-r--r-- | store/source/storpage.hxx | 2 | ||||
-rw-r--r-- | store/source/stortree.hxx | 4 |
7 files changed, 53 insertions, 53 deletions
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx index 8aaadabeba9b..be7a4aaeb698 100644 --- a/store/source/lockbyte.cxx +++ b/store/source/lockbyte.cxx @@ -288,18 +288,18 @@ class FileLockBytes : /** ILockBytes implementation. */ - virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize); + virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) SAL_OVERRIDE; - virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset); - virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset); + virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) SAL_OVERRIDE; + virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) SAL_OVERRIDE; - virtual storeError readAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes); - virtual storeError writeAt_Impl (sal_uInt32 nOffset, void const * pBuffer, sal_uInt32 nBytes); + virtual storeError readAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE; + virtual storeError writeAt_Impl (sal_uInt32 nOffset, void const * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE; - virtual storeError getSize_Impl (sal_uInt32 & rnSize); - virtual storeError setSize_Impl (sal_uInt32 nSize); + virtual storeError getSize_Impl (sal_uInt32 & rnSize) SAL_OVERRIDE; + virtual storeError setSize_Impl (sal_uInt32 nSize) SAL_OVERRIDE; - virtual storeError flush_Impl(); + virtual storeError flush_Impl() SAL_OVERRIDE; /** Not implemented. */ @@ -313,8 +313,8 @@ public: /** Delegate multiple inherited IReference. */ - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; protected: /** Destruction. @@ -527,23 +527,23 @@ class MappedLockBytes : /** PageData::Allocator implementation. */ - virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize); - virtual void deallocate_Impl (void * pPage); + virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) SAL_OVERRIDE; + virtual void deallocate_Impl (void * pPage) SAL_OVERRIDE; /** ILockBytes implementation. */ - virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize); + virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) SAL_OVERRIDE; - virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset); - virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset); + virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) SAL_OVERRIDE; + virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) SAL_OVERRIDE; - virtual storeError readAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes); - virtual storeError writeAt_Impl (sal_uInt32 nOffset, const void * pBuffer, sal_uInt32 nBytes); + virtual storeError readAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE; + virtual storeError writeAt_Impl (sal_uInt32 nOffset, const void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE; - virtual storeError getSize_Impl (sal_uInt32 & rnSize); - virtual storeError setSize_Impl (sal_uInt32 nSize); + virtual storeError getSize_Impl (sal_uInt32 & rnSize) SAL_OVERRIDE; + virtual storeError setSize_Impl (sal_uInt32 nSize) SAL_OVERRIDE; - virtual storeError flush_Impl(); + virtual storeError flush_Impl() SAL_OVERRIDE; /** Not implemented. */ @@ -557,8 +557,8 @@ public: /** Delegate multiple inherited IReference. */ - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; protected: /* Destruction. @@ -684,18 +684,18 @@ class MemoryLockBytes : /** ILockBytes implementation. */ - virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize); + virtual storeError initialize_Impl (rtl::Reference< PageData::Allocator > & rxAllocator, sal_uInt16 nPageSize) SAL_OVERRIDE; - virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset); - virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset); + virtual storeError readPageAt_Impl (PageHolder & rPage, sal_uInt32 nOffset) SAL_OVERRIDE; + virtual storeError writePageAt_Impl (PageHolder const & rPage, sal_uInt32 nOffset) SAL_OVERRIDE; - virtual storeError readAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes); - virtual storeError writeAt_Impl (sal_uInt32 nOffset, const void * pBuffer, sal_uInt32 nBytes); + virtual storeError readAt_Impl (sal_uInt32 nOffset, void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE; + virtual storeError writeAt_Impl (sal_uInt32 nOffset, const void * pBuffer, sal_uInt32 nBytes) SAL_OVERRIDE; - virtual storeError getSize_Impl (sal_uInt32 & rnSize); - virtual storeError setSize_Impl (sal_uInt32 nSize); + virtual storeError getSize_Impl (sal_uInt32 & rnSize) SAL_OVERRIDE; + virtual storeError setSize_Impl (sal_uInt32 nSize) SAL_OVERRIDE; - virtual storeError flush_Impl(); + virtual storeError flush_Impl() SAL_OVERRIDE; /** Not implemented. */ @@ -709,8 +709,8 @@ public: /** Delegate multiple inherited IReference. */ - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; protected: /** Destruction. diff --git a/store/source/object.hxx b/store/source/object.hxx index a6835bd76fc1..c7a28219c75f 100644 --- a/store/source/object.hxx +++ b/store/source/object.hxx @@ -79,8 +79,8 @@ public: /** IReference. */ - virtual oslInterlockedCount SAL_CALL acquire (void); - virtual oslInterlockedCount SAL_CALL release (void); + virtual oslInterlockedCount SAL_CALL acquire (void) SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release (void) SAL_OVERRIDE; protected: /** Destruction. diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx index 2173992b1cf2..e6e8deb82e19 100644 --- a/store/source/storbase.cxx +++ b/store/source/storbase.cxx @@ -84,11 +84,11 @@ public: /** Delegate multiple inherited rtl::IReference. */ - virtual oslInterlockedCount SAL_CALL acquire() + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE { return OStoreObject::acquire(); } - virtual oslInterlockedCount SAL_CALL release() + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE { return OStoreObject::release(); } @@ -106,8 +106,8 @@ private: /** PageData::Allocator implementation. */ - virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize); - virtual void deallocate_Impl (void * pPage); + virtual void allocate_Impl (void ** ppPage, sal_uInt16 * pnSize) SAL_OVERRIDE; + virtual void deallocate_Impl (void * pPage) SAL_OVERRIDE; /** Not implemented. */ diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx index b76559e4243f..8acb930872f7 100644 --- a/store/source/storcach.cxx +++ b/store/source/storcach.cxx @@ -255,18 +255,18 @@ class PageCache_Impl : // PageCache Implementation virtual storeError lookupPageAt_Impl ( PageHolder & rxPage, - sal_uInt32 nOffset); + sal_uInt32 nOffset) SAL_OVERRIDE; virtual storeError insertPageAt_Impl ( PageHolder const & rxPage, - sal_uInt32 nOffset); + sal_uInt32 nOffset) SAL_OVERRIDE; virtual storeError updatePageAt_Impl ( PageHolder const & rxPage, - sal_uInt32 nOffset); + sal_uInt32 nOffset) SAL_OVERRIDE; virtual storeError removePageAt_Impl ( - sal_uInt32 nOffset); + sal_uInt32 nOffset) SAL_OVERRIDE; // Not implemented PageCache_Impl (PageCache_Impl const &); @@ -277,8 +277,8 @@ public: explicit PageCache_Impl (sal_uInt16 nPageSize); // Delegate multiple inherited IReference - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; protected: // Destruction diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx index 88f8f74acb41..99fd312b8498 100644 --- a/store/source/stordata.hxx +++ b/store/source/stordata.hxx @@ -116,8 +116,8 @@ public: /** External representation. */ - virtual storeError guard (sal_uInt32 nAddr); - virtual storeError verify (sal_uInt32 nAddr) const; + virtual storeError guard (sal_uInt32 nAddr) SAL_OVERRIDE; + virtual storeError verify (sal_uInt32 nAddr) const SAL_OVERRIDE; }; /*======================================================================== @@ -230,8 +230,8 @@ public: sal_uInt32 nAddr, OStorePageBIOS & rBIOS); - virtual storeError guard (sal_uInt32 nAddr); - virtual storeError verify (sal_uInt32 nAddr) const; + virtual storeError guard (sal_uInt32 nAddr) SAL_OVERRIDE; + virtual storeError verify (sal_uInt32 nAddr) const SAL_OVERRIDE; /** read (indirect data page). */ @@ -698,8 +698,8 @@ public: /** External representation. */ - virtual storeError guard (sal_uInt32 nAddr); - virtual storeError verify (sal_uInt32 nAddr) const; + virtual storeError guard (sal_uInt32 nAddr) SAL_OVERRIDE; + virtual storeError verify (sal_uInt32 nAddr) const SAL_OVERRIDE; /** attrib. */ diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx index 6dc579e4b9b0..0b1b0c95ecaa 100644 --- a/store/source/storpage.hxx +++ b/store/source/storpage.hxx @@ -52,7 +52,7 @@ public: virtual storeError initialize ( ILockBytes * pLockBytes, storeAccessMode eAccessMode, - sal_uInt16 & rnPageSize); + sal_uInt16 & rnPageSize) SAL_OVERRIDE; /** isValid. * @return sal_True upon successful initialization, diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx index 81d3d80e7bb6..09dc6b0256d1 100644 --- a/store/source/stortree.hxx +++ b/store/source/stortree.hxx @@ -247,8 +247,8 @@ public: /** External representation. */ - virtual storeError guard (sal_uInt32 nAddr); - virtual storeError verify (sal_uInt32 nAddr) const; + virtual storeError guard (sal_uInt32 nAddr) SAL_OVERRIDE; + virtual storeError verify (sal_uInt32 nAddr) const SAL_OVERRIDE; /** split. * |