summaryrefslogtreecommitdiff
path: root/sal/qa
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 /sal/qa
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 'sal/qa')
-rw-r--r--sal/qa/osl/condition/osl_Condition.cxx2
-rw-r--r--sal/qa/osl/mutex/osl_Mutex.cxx18
-rw-r--r--sal/qa/osl/process/osl_Thread.cxx14
-rw-r--r--sal/qa/rtl/doublelock/rtl_doublelocking.cxx2
4 files changed, 18 insertions, 18 deletions
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index 3c3401a8eb6d..417cc3bfb853 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -67,7 +67,7 @@ public:
//get the Condition to operate
ConditionThread( ::osl::Condition& Con, ConditionType tType): m_MyCon( Con ), m_MyType( tType ) { }
- ~ConditionThread( )
+ virtual ~ConditionThread( )
{
// LLA: do not throw in DTors!
// LLA: CPPUNIT_ASSERT_MESSAGE( "#ConditionThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 2d5e977c96ed..dce24e73e8c4 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -96,7 +96,7 @@ class IncreaseThread : public Thread
public:
IncreaseThread( struct resource *pData ): pResource( pData ) { }
- ~IncreaseThread( )
+ virtual ~IncreaseThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#IncreaseThread does not shutdown properly.\n", !isRunning( ) );
}
@@ -124,7 +124,7 @@ class DecreaseThread : public Thread
public:
DecreaseThread( struct resource *pData ): pResource( pData ) { }
- ~DecreaseThread( )
+ virtual ~DecreaseThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#DecreaseThread does not shutdown properly.\n", !isRunning( ) );
}
@@ -162,7 +162,7 @@ public:
//get the struct pointer to write data to buffer
PutThread( struct chain* pData ): pChain( pData ) { }
- ~PutThread( )
+ virtual ~PutThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#PutThread does not shutdown properly.\n", !isRunning( ) );
}
@@ -200,7 +200,7 @@ public:
//get the Mutex pointer to operate
HoldThread( Mutex* pMutex ): pMyMutex( pMutex ) { }
- ~HoldThread( )
+ virtual ~HoldThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#HoldThread does not shutdown properly.\n", !isRunning( ) );
}
@@ -222,7 +222,7 @@ public:
//get the Mutex pointer to operate
WaitThread( Mutex* pMutex ): pMyMutex( pMutex ) { }
- ~WaitThread( )
+ virtual ~WaitThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#WaitThread does not shutdown properly.\n", !isRunning( ) );
}
@@ -246,7 +246,7 @@ public:
//get the Mutex pointer to operate
GlobalMutexThread( ){ }
- ~GlobalMutexThread( )
+ virtual ~GlobalMutexThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#GlobalMutexThread does not shutdown properly.\n", !isRunning( ) );
}
@@ -567,7 +567,7 @@ public:
//get the Mutex pointer to operate
GuardThread( Mutex* pMutex ): pMyMutex( pMutex ) { }
- ~GuardThread( )
+ virtual ~GuardThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#GuardThread does not shutdown properly.\n", !isRunning( ) );
}
@@ -653,7 +653,7 @@ public:
//get the Mutex pointer to operate
ClearGuardThread( Mutex* pMutex ): pMyMutex( pMutex ) {}
- ~ClearGuardThread( )
+ virtual ~ClearGuardThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#ClearGuardThread does not shutdown properly.\n", !isRunning( ) );
}
@@ -795,7 +795,7 @@ public:
//get the Mutex pointer to operate
ResetGuardThread( Mutex* pMutex ): pMyMutex( pMutex ) {}
- ~ResetGuardThread( )
+ virtual ~ResetGuardThread( )
{
CPPUNIT_ASSERT_MESSAGE( "#ResetGuardThread does not shutdown properly.\n", !isRunning( ) );
}
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 74e692e2c0f6..e4b388298b2f 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -256,7 +256,7 @@ public:
m_aFlag.release();
}
- ~myThread()
+ virtual ~myThread()
{
if (isRunning())
{
@@ -321,7 +321,7 @@ protected:
}
public:
- ~OCountThread()
+ virtual ~OCountThread()
{
if (isRunning())
{
@@ -368,7 +368,7 @@ protected:
}
public:
- ~OSuspendThread()
+ virtual ~OSuspendThread()
{
if (isRunning())
{
@@ -410,7 +410,7 @@ public:
{
t_print("new thread id %u!\n", (unsigned) getIdentifier());
}
- ~ONoScheduleThread()
+ virtual ~ONoScheduleThread()
{
if (isRunning())
{
@@ -451,7 +451,7 @@ protected:
}
public:
- ~OAddThread()
+ virtual ~OAddThread()
{
if (isRunning())
{
@@ -1924,7 +1924,7 @@ private:
ThreadHelper::thread_sleep_tenth_sec(3);
}
public:
- ~myKeyThread()
+ virtual ~myKeyThread()
{
if (isRunning())
{
@@ -1952,7 +1952,7 @@ private:
}
public:
- ~idThread()
+ virtual ~idThread()
{
if (isRunning())
{
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 84685b8880a7..1a8912bbcd91 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -133,7 +133,7 @@ public:
::osl::Thread::suspend();
}
- ~OGetThread()
+ virtual ~OGetThread()
{
if (isRunning())
{