diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 15:10:39 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 21:41:22 +0100 |
| commit | 8471ba7b97a2a01039133674d3960c5c16803833 (patch) | |
| tree | 2011f7b8b395ed5195b283002add798463958db0 /include/jvmfwk | |
| parent | -Werror=shadow (diff) | |
| download | core-8471ba7b97a2a01039133674d3960c5c16803833.tar.gz core-8471ba7b97a2a01039133674d3960c5c16803833.zip | |
No need for extern "C" here
...and fix resulting loplugin:salbool fallout
Change-Id: I5ae1497608d31c20b0d10676450a7673dee1c651
Diffstat (limited to 'include/jvmfwk')
| -rw-r--r-- | include/jvmfwk/framework.hxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index 9ba49ceee988..ce7363c04c00 100644 --- a/include/jvmfwk/framework.hxx +++ b/include/jvmfwk/framework.hxx @@ -27,8 +27,6 @@ #include <osl/mutex.h> #include "jni.h" -extern "C" { - /** @file <p>This library can operate in two modes, application mode and direct mode.</p> @@ -285,10 +283,10 @@ JVMFWK_DLLPUBLIC void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo); @param pInfoB the second argument which is compared with the first. @return - sal_True - both object represent the same JRE.</br> - sal_False - the objects represend different JREs + true - both object represent the same JRE.</br> + false - the objects represend different JREs */ -JVMFWK_DLLPUBLIC sal_Bool SAL_CALL jfw_areEqualJavaInfo( +JVMFWK_DLLPUBLIC bool SAL_CALL jfw_areEqualJavaInfo( JavaInfo const * pInfoA,JavaInfo const * pInfoB); /** determines if a Java Virtual Machine is already running. @@ -573,7 +571,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInf /** determines if Java can be used. - <p>If <code>bEnabled</code> is <code>sal_False</code> then a call + <p>If <code>bEnabled</code> is <code>false</code> then a call to jfw_startVM will result in an error with the errorcode <code>JFW_E_JAVA_DISABLED</code></p> @@ -587,7 +585,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInf were not met.<br/> JFW_E_DIRECT_MODE the function cannot be used in this mode. */ -JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled); +JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setEnabled(bool bEnabled); /** provides the information if Java can be used. @@ -766,8 +764,6 @@ JVMFWK_DLLPUBLIC void SAL_CALL jfw_lock(); */ JVMFWK_DLLPUBLIC void SAL_CALL jfw_unlock(); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |