summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-05 20:54:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-05 22:21:49 +0000
commit4d6a509efe6bd56613b5554556d3a4f7f4cfd0d5 (patch)
tree22fc10679131c72993615d0fa634460d14a15ec8 /stoc
parent076b098ddf80fc78773d3ed97b7fd50dbcb4ebb6 (diff)
convert all remaining BOOST_STATIC_ASSERT to static_assert
and we can include a few less headers Change-Id: Id742849ff4c1c37a2b861aa3d6ab823f00ea87f8
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/javaloader/javaloader.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 519cd2ac9c07..c4d78d023d6f 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -19,8 +19,6 @@
#include <cstdarg>
-#include <boost/static_assert.hpp>
-
#include <osl/diagnose.h>
#include <osl/process.h>
@@ -157,8 +155,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:
- BOOST_STATIC_ASSERT(sizeof (sal_Int64)
- >= sizeof (jvmaccess::UnoVirtualMachine *));
+ static_assert(sizeof (sal_Int64)
+ >= sizeof (jvmaccess::UnoVirtualMachine *), "must be at least the same size");
sal_Int64 nPointer = reinterpret_cast< sal_Int64 >(
static_cast< jvmaccess::UnoVirtualMachine * >(0));
javaVM_xJavaVM->getJavaVM(processID) >>= nPointer;