[Libreoffice-commits] .: jvmaccess/source

Tor Lillqvist tml at kemper.freedesktop.org
Mon Oct 3 06:21:26 PDT 2011


 jvmaccess/source/classpath.cxx         |    7 +++++++
 jvmaccess/source/unovirtualmachine.cxx |    2 ++
 jvmaccess/source/virtualmachine.cxx    |    1 +
 3 files changed, 10 insertions(+)

New commits:
commit d83eab64076aed534f481960ff3a18962633c297
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Oct 3 16:13:17 2011 +0300

    WaE: unreferenced formal parameters in the !SOLAR_JAVA case

diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index 102ed1d..2389a94 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -126,6 +126,9 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
     }
     return result;
 #else
+    (void) context;
+    (void) environment;
+    (void) classPath;
     return 0;
 #endif
 }
@@ -170,6 +173,10 @@ void * ::jvmaccess::ClassPath::doLoadClass(
     }
     return env->CallObjectMethodA(cl, methLoadClass, &arg);
 #else
+    (void) context;
+    (void) environment;
+    (void) classPath;
+    (void) name;
     return 0;
 #endif
 }
diff --git a/jvmaccess/source/unovirtualmachine.cxx b/jvmaccess/source/unovirtualmachine.cxx
index 436575c..a2c0385 100644
--- a/jvmaccess/source/unovirtualmachine.cxx
+++ b/jvmaccess/source/unovirtualmachine.cxx
@@ -65,6 +65,8 @@ UnoVirtualMachine::UnoVirtualMachine(
             jvmaccess::VirtualMachine::AttachGuard(m_virtualMachine).
             getEnvironment()->NewGlobalRef(static_cast< jobject >(classLoader));
     } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) {}
+#else
+    (void) classLoader;
 #endif
     if (m_classLoader == 0) {
         throw CreationException();
diff --git a/jvmaccess/source/virtualmachine.cxx b/jvmaccess/source/virtualmachine.cxx
index a257f55..da7aa38 100644
--- a/jvmaccess/source/virtualmachine.cxx
+++ b/jvmaccess/source/virtualmachine.cxx
@@ -94,6 +94,7 @@ VirtualMachine::~VirtualMachine()
 JNIEnv * VirtualMachine::attachThread(bool * pAttached) const
 {
 #ifndef SOLAR_JAVA
+    (void) pAttached;
     return 0;
 #else
     OSL_ENSURE(pAttached != 0, "bad parameter");


More information about the Libreoffice-commits mailing list