summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-11-21 17:50:33 +0100
committerMichael Stahl <mstahl@redhat.com>2014-11-21 17:52:10 +0100
commitf085b0ab07edbf812a179a5679487386834fe38a (patch)
treed7c1f8b6910d73539b3c33a55d4e6918eb798aec
parent42ff131336b79ffb5d6a498227bc4dbcfb7bcbee (diff)
bridges: oops, static_assert requires 2nd string parameter
Change-Id: I09b461473f514f2b7c4f256aedbe129372bae9e3
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx4
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx2
-rw-r--r--bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx2
9 files changed, 10 insertions, 10 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index 343d15558566..49222789b73b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -543,7 +543,7 @@ unsigned char* codeSnippet( unsigned char * code, sal_Int16 nFunctionIndex, sal_
if (! simple_ret_type)
nOffsetAndIndex |= 0x8000;
- static_assert( sizeof (long) == 4 );
+ static_assert(sizeof (long) == 4, "boo");
/* generate this code */
// lr %r0,%r13
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 53d71f93a1fc..fb475cf46d32 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -96,7 +96,7 @@ static typelib_TypeClass cpp2uno_call(
{
if ((reinterpret_cast< long >(pCppStack) & 7) != 0)
{
- static_assert(sizeof (double) == sizeof (sal_Int64));
+ static_assert(sizeof (double) == sizeof (sal_Int64), "boo");
void * pDest = alloca( sizeof (sal_Int64) );
*reinterpret_cast< sal_Int32 * >(pDest) =
*reinterpret_cast< sal_Int32 const * >(pCppStack);
@@ -442,7 +442,7 @@ unsigned char * codeSnippet(
index |= 0x80000000;
}
unsigned int * p = reinterpret_cast< unsigned int * >(code);
- static_assert(sizeof (unsigned int) == 4);
+ static_assert(sizeof (unsigned int) == 4, "boo");
// st %o0, [%sp+68]:
*p++ = 0xD023A044;
// st %o1, [%sp+72]:
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index 0ac80dc26925..f3e47965e6fd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -336,7 +336,7 @@ static void cpp_call(
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
case typelib_TypeClass_DOUBLE:
- static_assert(sizeof (double) == sizeof (sal_Int64));
+ static_assert(sizeof (double) == sizeof (sal_Int64), "boo");
*reinterpret_cast< sal_Int32 * >(pCppStack) =
*reinterpret_cast< sal_Int32 const * >(pUnoArgs[ nPos ]);
pCppStack += sizeof (sal_Int32);
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 4ad28d290939..5ef0fdc80349 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -407,7 +407,7 @@ unsigned char * codeSnippet(
functionIndex |= 0x80000000;
}
unsigned char * p = code;
- static_assert(sizeof (sal_Int32) == 4);
+ static_assert(sizeof (sal_Int32) == 4, "boo");
// mov function_index, %eax:
*p++ = 0xB8;
*reinterpret_cast< sal_Int32 * >(p) = functionIndex;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index ce76c24f6fb6..f5fe6e78a100 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -97,7 +97,7 @@ static typelib_TypeClass cpp2uno_call(
{
if ((reinterpret_cast< long >(pCppStack) & 7) != 0)
{
- static_assert(sizeof (double) == sizeof (sal_Int64));
+ static_assert(sizeof (double) == sizeof (sal_Int64), "boo");
void * pDest = alloca( sizeof (sal_Int64) );
*reinterpret_cast< sal_Int32 * >(pDest) =
*reinterpret_cast< sal_Int32 const * >(pCppStack);
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index 9f02aeb77495..45cbc2f0b6c8 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
@@ -331,7 +331,7 @@ static void cpp_call(
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
case typelib_TypeClass_DOUBLE:
- static_assert(sizeof (double) == sizeof (sal_Int64));
+ static_assert(sizeof (double) == sizeof (sal_Int64), "boo");
*reinterpret_cast< sal_Int32 * >(pCppStack) =
*reinterpret_cast< sal_Int32 const * >(pUnoArgs[ nPos ]);
pCppStack += sizeof (sal_Int32);
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index 740330fb254f..0d376e65be4f 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -406,7 +406,7 @@ unsigned char * codeSnippet(
if (returnType)
TYPELIB_DANGER_RELEASE( returnTypeDescr );
unsigned char * p = code;
- static_assert(sizeof (sal_Int32) == 4);
+ static_assert(sizeof (sal_Int32) == 4, "boo");
// mov function_index, %eax:
*p++ = 0xB8;
*reinterpret_cast< sal_Int32 * >(p) = functionIndex;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 92a003a775d1..229159f6f3ae 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -402,7 +402,7 @@ unsigned char * codeSnippet(
unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset)
{
unsigned char * p = code;
- static_assert(sizeof (sal_Int32) == 4);
+ static_assert(sizeof (sal_Int32) == 4, "boo");
// mov eax, functionIndex:
*p++ = 0xB8;
*reinterpret_cast< sal_Int32 * >(p) = functionIndex;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
index c99e51cbd734..53730f210fab 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
@@ -172,7 +172,7 @@ static void cpp_call(
// stack space
- static_assert(sizeof(void *) == sizeof(sal_Int32));
+ static_assert(sizeof(void *) == sizeof(sal_Int32), "### unexpected size!");
// args
void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams );
// indices of values this have to be converted (interface conversion cpp<=>uno)