diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-04 22:46:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-05 00:18:50 +0300 |
| commit | b7525f1f1d123084b60269f420300afdd405b0d1 (patch) | |
| tree | 0b2e32b3879a27802c0e607b187c1b43ab697c9e /jvmaccess/source/virtualmachine.cxx | |
| parent | f5928f09ad53de2c4683000619d29be140a97be8 (diff) | |
Drop jvmaccess and jvmfwk when no SOLAR_JAVA
Just sprinkle #ifdef SOLAR_JAVA into the code instead.
In the source for jvmaccess and jvmfwk such ifdefs can be removed as
it isn't compiled unless SOLAR_JAVA.
Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606
Diffstat (limited to 'jvmaccess/source/virtualmachine.cxx')
| -rw-r--r-- | jvmaccess/source/virtualmachine.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/jvmaccess/source/virtualmachine.cxx b/jvmaccess/source/virtualmachine.cxx index f6500f9265c7..23192ab3e437 100644 --- a/jvmaccess/source/virtualmachine.cxx +++ b/jvmaccess/source/virtualmachine.cxx @@ -61,10 +61,8 @@ VirtualMachine::VirtualMachine(JavaVM * pVm, int nVersion, bool bDestroy, m_pVm(pVm), m_nVersion(nVersion), m_bDestroy(bDestroy) { (void) pMainThreadEnv; // avoid warnings -#ifdef SOLAR_JAVA OSL_ENSURE(pVm != 0 && nVersion >= JNI_VERSION_1_2 && pMainThreadEnv != 0, "bad parameter"); -#endif } VirtualMachine::~VirtualMachine() @@ -84,10 +82,6 @@ VirtualMachine::~VirtualMachine() JNIEnv * VirtualMachine::attachThread(bool * pAttached) const { -#ifndef SOLAR_JAVA - (void) pAttached; - return 0; -#else OSL_ENSURE(pAttached != 0, "bad parameter"); JNIEnv * pEnv; jint n = m_pVm->GetEnv(reinterpret_cast< void ** >(&pEnv), m_nVersion); @@ -113,16 +107,13 @@ JNIEnv * VirtualMachine::attachThread(bool * pAttached) const else *pAttached = false; return pEnv; -#endif } void VirtualMachine::detachThread() const { -#ifdef SOLAR_JAVA if (m_pVm->DetachCurrentThread() != JNI_OK) { OSL_FAIL("JNI: DetachCurrentThread failed"); } -#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |