strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use BOOST_STATIC_ASSERT for sizeof check

Browse source 
Change-Id: Iad00aa47ef65fe163eff407549c26eb3590ab132
This commit is contained in:
Michael Stahl 2014-07-23 22:58:49 +02:00
parent 23c5a5362b
commit 1d36d91d0a
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stoc/Library_javaloader.mk
View file

@ -9,6 +9,8 @@
$(eval $(call gb_Library_Library,javaloader))
$(eval $(call gb_Library_use_external,javaloader,boost_headers))
$(eval $(call gb_Library_use_udk_api,javaloader))
$(eval $(call gb_Library_use_libraries,javaloader,\

8
stoc/source/javaloader/javaloader.cxx
View file

@ -18,6 +18,9 @@
*/
#include <cstdarg>
#include <boost/static_assert.hpp>
#include <osl/diagnose.h>
#include <osl/process.h>
@ -155,9 +158,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
// as long as our reference to the XJavaVM service lasts), and
// convert the non-refcounted pointer into a refcounted one
// immediately:
OSL_ENSURE(sizeof (sal_Int64)
>= sizeof (jvmaccess::UnoVirtualMachine *),
"Pointer cannot be represented as sal_Int64");
BOOST_STATIC_ASSERT(sizeof (sal_Int64)
>= sizeof (jvmaccess::UnoVirtualMachine *));
sal_Int64 nPointer = reinterpret_cast< sal_Int64 >(
static_cast< jvmaccess::UnoVirtualMachine * >(0));
javaVM_xJavaVM->getJavaVM(processID) >>= nPointer;