convert all remaining BOOST_STATIC_ASSERT to static_assert

and we can include a few less headers

Change-Id: Id742849ff4c1c37a2b861aa3d6ab823f00ea87f8

3 files changed, 14 insertions, 17 deletions

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 8085445856f3..9af0e321992c 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -21,7 +21,6 @@
 
 #include <dlfcn.h>
 
-#include <boost/static_assert.hpp>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
@@ -48,8 +47,8 @@ struct Fake_type_info {
     char const * name;
 };
 
-BOOST_STATIC_ASSERT(
-    sizeof (Fake_type_info) == sizeof (std::type_info));
+static_assert(
+    sizeof (Fake_type_info) == sizeof (std::type_info), "must be the same size");
 
 struct Fake_class_type_info: Fake_type_info {};
 
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 8055a8b8e754..7132c4673370 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -27,7 +27,6 @@
 
 #include <dlfcn.h>
 
-#include "boost/static_assert.hpp"
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/genfunc.hxx"
 #include <sal/log.hxx>
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index 0d37b58d426a..03f0868d4b9b 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -25,7 +25,6 @@
 #include "jni_bridge.h"
 #include "jniunoenvironmentdata.hxx"
 
-#include <boost/static_assert.hpp>
 #include "jvmaccess/unovirtualmachine.hxx"
 #include "rtl/ref.hxx"
 #include "rtl/strbuf.hxx"
@@ -64,7 +63,7 @@ void SAL_CALL Mapping_map_to_uno(
     uno_Interface ** ppUnoI = (uno_Interface **)ppOut;
     jobject javaI = (jobject) pIn;
 
-    BOOST_STATIC_ASSERT( sizeof (void *) == sizeof (jobject) );
+    static_assert(sizeof (void *) == sizeof (jobject), "must be the same size");
     assert(ppUnoI != 0);
     assert(td != 0);
 
@@ -123,7 +122,7 @@ void SAL_CALL Mapping_map_to_java(
     jobject * ppJavaI = (jobject *) ppOut;
     uno_Interface * pUnoI = (uno_Interface *)pIn;
 
-    BOOST_STATIC_ASSERT( sizeof (void *) == sizeof (jobject) );
+    static_assert(sizeof (void *) == sizeof (jobject), "must be the same size");
     assert(ppJavaI != 0);
     assert(td != 0);
 
@@ -524,16 +523,16 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
         *ppMapping = 0;
     }
 
-    BOOST_STATIC_ASSERT( JNI_FALSE == sal_False );
-    BOOST_STATIC_ASSERT( JNI_TRUE == sal_True );
-    BOOST_STATIC_ASSERT( sizeof (jboolean) == sizeof (sal_Bool) );
-    BOOST_STATIC_ASSERT( sizeof (jchar) == sizeof (sal_Unicode) );
-    BOOST_STATIC_ASSERT( sizeof (jdouble) == sizeof (double) );
-    BOOST_STATIC_ASSERT( sizeof (jfloat) == sizeof (float) );
-    BOOST_STATIC_ASSERT( sizeof (jbyte) == sizeof (sal_Int8) );
-    BOOST_STATIC_ASSERT( sizeof (jshort) == sizeof (sal_Int16) );
-    BOOST_STATIC_ASSERT( sizeof (jint) == sizeof (sal_Int32) );
-    BOOST_STATIC_ASSERT( sizeof (jlong) == sizeof (sal_Int64) );
+    static_assert(JNI_FALSE == sal_False, "must be equal");
+    static_assert(JNI_TRUE == sal_True, "must be equal");
+    static_assert(sizeof (jboolean) == sizeof (sal_Bool), "must be the same size");
+    static_assert(sizeof (jchar) == sizeof (sal_Unicode), "must be the same size");
+    static_assert(sizeof (jdouble) == sizeof (double), "must be the same size");
+    static_assert(sizeof (jfloat) == sizeof (float), "must be the same size");
+    static_assert(sizeof (jbyte) == sizeof (sal_Int8), "must be the same size");
+    static_assert(sizeof (jshort) == sizeof (sal_Int16), "must be the same size");
+    static_assert(sizeof (jint) == sizeof (sal_Int32), "must be the same size");
+    static_assert(sizeof (jlong) == sizeof (sal_Int64), "must be the same size");
 
     OUString const & from_env_typename =
         OUString::unacquired( &pFrom->pTypeName );