summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /jvmfwk
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (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 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx2
4 files changed, 10 insertions, 10 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 0b1aa6bf2a03..5fb6f9f66845 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -35,11 +35,11 @@ public:
static rtl::Reference<VendorBase> createInstance();
- virtual char const* const* getRuntimePaths(int * size);
+ virtual char const* const* getRuntimePaths(int * size) SAL_OVERRIDE;
virtual bool initialize(
- std::vector<std::pair<OUString, OUString> > props);
- virtual int compareVersions(const OUString& sSecond) const;
+ std::vector<std::pair<OUString, OUString> > props) SAL_OVERRIDE;
+ virtual int compareVersions(const OUString& sSecond) const SAL_OVERRIDE;
};
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index c2f33ee2dce7..a9ced5d051a2 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -35,9 +35,9 @@ public:
static rtl::Reference<VendorBase> createInstance();
using VendorBase::getLibraryPaths;
- virtual char const* const* getRuntimePaths(int * size);
- virtual char const* const* getLibraryPaths(int* size);
- virtual int compareVersions(const OUString& sSecond) const;
+ virtual char const* const* getRuntimePaths(int * size) SAL_OVERRIDE;
+ virtual char const* const* getLibraryPaths(int* size) SAL_OVERRIDE;
+ virtual int compareVersions(const OUString& sSecond) const SAL_OVERRIDE;
};
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 9fd310e23542..69485b5b8c43 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -34,10 +34,10 @@ public:
static rtl::Reference<VendorBase> createInstance();
using VendorBase::getLibraryPaths;
- virtual char const* const* getRuntimePaths(int * size);
- virtual char const* const* getLibraryPaths(int* size);
+ virtual char const* const* getRuntimePaths(int * size) SAL_OVERRIDE;
+ virtual char const* const* getLibraryPaths(int* size) SAL_OVERRIDE;
- virtual int compareVersions(const OUString& sSecond) const;
+ virtual int compareVersions(const OUString& sSecond) const SAL_OVERRIDE;
};
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index f87aa7221e9f..59999c105f57 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -299,7 +299,7 @@ class AsynchReader: public salhelper::Thread
virtual ~AsynchReader() {}
- void execute();
+ void execute() SAL_OVERRIDE;
public:
AsynchReader(oslFileHandle & rHandle);