Kaydet (Commit) 1d36d91d authored tarafından Michael Stahl's avatar Michael Stahl

use BOOST_STATIC_ASSERT for sizeof check

Change-Id: Iad00aa47ef65fe163eff407549c26eb3590ab132
üst 23c5a536
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
$(eval $(call gb_Library_Library,javaloader)) $(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_udk_api,javaloader))
$(eval $(call gb_Library_use_libraries,javaloader,\ $(eval $(call gb_Library_use_libraries,javaloader,\
......
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
*/ */
#include <cstdarg> #include <cstdarg>
#include <boost/static_assert.hpp>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/process.h> #include <osl/process.h>
...@@ -155,9 +158,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL ...@@ -155,9 +158,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
// as long as our reference to the XJavaVM service lasts), and // as long as our reference to the XJavaVM service lasts), and
// convert the non-refcounted pointer into a refcounted one // convert the non-refcounted pointer into a refcounted one
// immediately: // immediately:
OSL_ENSURE(sizeof (sal_Int64) BOOST_STATIC_ASSERT(sizeof (sal_Int64)
>= sizeof (jvmaccess::UnoVirtualMachine *), >= sizeof (jvmaccess::UnoVirtualMachine *));
"Pointer cannot be represented as sal_Int64");
sal_Int64 nPointer = reinterpret_cast< sal_Int64 >( sal_Int64 nPointer = reinterpret_cast< sal_Int64 >(
static_cast< jvmaccess::UnoVirtualMachine * >(0)); static_cast< jvmaccess::UnoVirtualMachine * >(0));
javaVM_xJavaVM->getJavaVM(processID) >>= nPointer; javaVM_xJavaVM->getJavaVM(processID) >>= nPointer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment