summaryrefslogtreecommitdiff
path: root/stoc/source/javavm
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 08:35:34 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 08:35:34 +1000
commit99ef7846544ea4548fb607df37aa0429d68c2ebe (patch)
tree4d8f5a96617cc48e06adb0f389445b4e3088b6ed /stoc/source/javavm
parentf81e6f5c78686be9d58174800983012ec025b849 (diff)
tdf#43157: convert stoc from OSL_ASSERT to assert
Change-Id: I7d1b2748a4f4afd873ee4d65d153c76b249507dd
Diffstat (limited to 'stoc/source/javavm')
-rw-r--r--stoc/source/javavm/javavm.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index a4e9efe66e59..a46e9c858ac4 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -573,7 +573,7 @@ public:
~DetachCurrentThread() {
if (m_jvm->DetachCurrentThread() != 0) {
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -823,7 +823,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
case JFW_E_RUNNING_JVM:
{
//This service should make sure that we do not start java twice.
- OSL_ASSERT(false);
+ assert(false);
break;
}
case JFW_E_NEED_RESTART:
@@ -884,12 +884,12 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
}
return css::uno::makeAny(reinterpret_cast< sal_IntPtr >(m_pJavaVm));
case RETURN_VIRTUALMACHINE:
- OSL_ASSERT(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
+ assert(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
return css::uno::makeAny(
reinterpret_cast< sal_Int64 >(
m_xUnoVirtualMachine->getVirtualMachine().get()));
case RETURN_UNOVIRTUALMACHINE:
- OSL_ASSERT(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
+ assert(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
return css::uno::makeAny(
reinterpret_cast< sal_Int64 >(m_xUnoVirtualMachine.get()));
}