summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-10-22 19:22:26 +0300
committerTor Lillqvist <tml@collabora.com>2014-10-22 19:28:04 +0300
commita60ce288fadeffce563216d353abf9a9d953317c (patch)
treea7644b9e9743a61f773a346957953591952d4bfc /configmgr
parent42a78549ce3c3cedb0e501d0488e0b85bfd5e8a8 (diff)
WaE: overriding virtual function declaration not marked 'override'
CppunitTest_configmgr_unit fails, though, so I did not uncomment it in Module_configmgr.mk. Presumably one would need to look in the old configmgr/qa/unit/makefile.mk to find out how to run it. Change-Id: Id368fd94076f873bfdd34f1829d6a009daa7fa84
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/qa/unit/test.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 3fd8d13e0f23..7d018068b50e 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -76,8 +76,8 @@ void normalize(
class Test: public CppUnit::TestFixture {
public:
- virtual void setUp();
- virtual void tearDown();
+ virtual void setUp() SAL_OVERRIDE;
+ virtual void tearDown() SAL_OVERRIDE;
void testKeyFetch();
void testKeySet();
@@ -129,7 +129,7 @@ protected:
virtual bool iteration() = 0;
private:
- virtual void SAL_CALL run();
+ virtual void SAL_CALL run() SAL_OVERRIDE;
osl::Condition & stop_;
bool success_;
@@ -165,7 +165,7 @@ public:
OUString const & relative);
private:
- virtual bool iteration();
+ virtual bool iteration() SAL_OVERRIDE;
Test const & test_;
OUString path_;
@@ -192,7 +192,7 @@ public:
OUString const & relative);
private:
- virtual bool iteration();
+ virtual bool iteration() SAL_OVERRIDE;
Test const & test_;
OUString path_;
@@ -237,11 +237,11 @@ protected:
private:
virtual void SAL_CALL disposing(css::lang::EventObject const &)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL propertyChange(
css::beans::PropertyChangeEvent const &)
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException) SAL_OVERRIDE;
int count_;
bool * destroyed_;
@@ -295,7 +295,7 @@ public:
SimpleRecursiveTest(Test const & theTest, int count, bool * destroyed);
private:
- virtual void step() const;
+ virtual void step() const SAL_OVERRIDE;
};
SimpleRecursiveTest::SimpleRecursiveTest(