summaryrefslogtreecommitdiff
path: root/cppu/source/uno/data.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cppu/source/uno/data.cxx')
-rw-r--r--cppu/source/uno/data.cxx56
1 files changed, 34 insertions, 22 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 1e42318dcd14..0971175b7625 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: data.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: dbo $ $Date: 2001-02-20 10:16:11 $
+ * last change: $Author: dbo $ $Date: 2001-03-09 12:10:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -82,7 +82,7 @@ typelib_TypeDescription * s_pQITD = 0;
void defaultConstructStruct(
void * pMem,
typelib_CompoundTypeDescription * pCompType )
- throw ()
+ SAL_THROW( () )
{
__defaultConstructStruct( pMem, pCompType );
}
@@ -91,7 +91,7 @@ void copyConstructStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_AcquireFunc acquire, uno_Mapping * mapping )
- throw ()
+ SAL_THROW( () )
{
__copyConstructStruct( pDest, pSource, pTypeDescr, acquire, mapping );
}
@@ -100,7 +100,7 @@ void destructStruct(
void * pValue,
typelib_CompoundTypeDescription * pTypeDescr,
uno_ReleaseFunc release )
- throw ()
+ SAL_THROW( () )
{
__destructStruct( pValue, pTypeDescr, release );
}
@@ -109,7 +109,7 @@ sal_Bool equalStruct(
void * pDest, void *pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
- throw ()
+ SAL_THROW( () )
{
return __equalStruct( pDest, pSource, pTypeDescr, queryInterface, release );
}
@@ -118,7 +118,7 @@ sal_Bool assignStruct(
void * pDest, void * pSource,
typelib_CompoundTypeDescription * pTypeDescr,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
- throw ()
+ SAL_THROW( () )
{
return __assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release );
}
@@ -127,7 +127,7 @@ void copyConstructSequence(
uno_Sequence ** ppDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_AcquireFunc acquire, uno_Mapping * mapping )
- throw ()
+ SAL_THROW( () )
{
__copyConstructSequence( ppDest, pSource, pElementType, acquire, mapping );
}
@@ -136,7 +136,7 @@ void destructSequence(
uno_Sequence ** ppSequence,
typelib_TypeDescriptionReference * pElementType,
uno_ReleaseFunc release )
- throw ()
+ SAL_THROW( () )
{
uno_Sequence * pSequence = *ppSequence;
OSL_ASSERT( pSequence );
@@ -154,7 +154,7 @@ sal_Bool equalSequence(
uno_Sequence * pDest, uno_Sequence * pSource,
typelib_TypeDescriptionReference * pElementType,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
- throw ()
+ SAL_THROW( () )
{
return __equalSequence( pDest, pSource, pElementType, queryInterface, release );
}
@@ -164,14 +164,14 @@ extern "C"
//##################################################################################################
SAL_DLLEXPORT void SAL_CALL uno_type_constructData(
void * pMem, typelib_TypeDescriptionReference * pType )
- throw ()
+ SAL_THROW_EXTERN_C()
{
__defaultConstructData( pMem, pType, 0 );
}
//##################################################################################################
SAL_DLLEXPORT void SAL_CALL uno_constructData(
void * pMem, typelib_TypeDescription * pTypeDescr )
- throw ()
+ SAL_THROW_EXTERN_C()
{
__defaultConstructData( pMem, pTypeDescr->pWeakRef, pTypeDescr );
}
@@ -179,7 +179,7 @@ SAL_DLLEXPORT void SAL_CALL uno_constructData(
SAL_DLLEXPORT void SAL_CALL uno_type_destructData(
void * pValue, typelib_TypeDescriptionReference * pType,
uno_ReleaseFunc release )
- throw ()
+ SAL_THROW_EXTERN_C()
{
__destructData( pValue, pType, 0, release );
}
@@ -188,7 +188,7 @@ SAL_DLLEXPORT void SAL_CALL uno_destructData(
void * pValue,
typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release )
- throw ()
+ SAL_THROW_EXTERN_C()
{
__destructData( pValue, pTypeDescr->pWeakRef, pTypeDescr, release );
}
@@ -197,7 +197,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_copyData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
uno_AcquireFunc acquire )
- throw ()
+ SAL_THROW_EXTERN_C()
{
__copyConstructData( pDest, pSource, pType, 0, acquire, 0 );
}
@@ -206,7 +206,7 @@ SAL_DLLEXPORT void SAL_CALL uno_copyData(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_AcquireFunc acquire )
- throw ()
+ SAL_THROW_EXTERN_C()
{
__copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 );
}
@@ -215,7 +215,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_copyAndConvertData(
void * pDest, void * pSource,
typelib_TypeDescriptionReference * pType,
uno_Mapping * mapping )
- throw ()
+ SAL_THROW_EXTERN_C()
{
__copyConstructData( pDest, pSource, pType, 0, 0, mapping );
}
@@ -224,7 +224,7 @@ SAL_DLLEXPORT void SAL_CALL uno_copyAndConvertData(
void * pDest, void * pSource,
typelib_TypeDescription * pTypeDescr,
uno_Mapping * mapping )
- throw ()
+ SAL_THROW_EXTERN_C()
{
__copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping );
}
@@ -233,7 +233,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_type_equalData(
void * pVal1, typelib_TypeDescriptionReference * pVal1Type,
void * pVal2, typelib_TypeDescriptionReference * pVal2Type,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
- throw ()
+ SAL_THROW_EXTERN_C()
{
return __equalData( pVal1, pVal1Type, 0,
pVal2, pVal2Type, 0,
@@ -244,7 +244,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_equalData(
void * pVal1, typelib_TypeDescription * pVal1TD,
void * pVal2, typelib_TypeDescription * pVal2TD,
uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
- throw ()
+ SAL_THROW_EXTERN_C()
{
return __equalData( pVal1, pVal1TD->pWeakRef, pVal1TD,
pVal2, pVal2TD->pWeakRef, pVal2TD,
@@ -255,7 +255,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_type_assignData(
void * pDest, typelib_TypeDescriptionReference * pDestType,
void * pSource, typelib_TypeDescriptionReference * pSourceType,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
- throw ()
+ SAL_THROW_EXTERN_C()
{
return __assignData( pDest, pDestType, 0,
pSource, pSourceType, 0,
@@ -266,7 +266,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_assignData(
void * pDest, typelib_TypeDescription * pDestTD,
void * pSource, typelib_TypeDescription * pSourceTD,
uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
- throw ()
+ SAL_THROW_EXTERN_C()
{
return __assignData( pDest, pDestTD->pWeakRef, pDestTD,
pSource, pSourceTD->pWeakRef, pSourceTD,
@@ -281,6 +281,7 @@ SAL_DLLEXPORT sal_Bool SAL_CALL uno_assignData(
#ifdef _DEBUG
+
#ifdef SAL_W32
# pragma pack(push, 8)
#elif defined(SAL_OS2)
@@ -303,6 +304,11 @@ struct O : public M
double p;
};
+struct P : public N
+{
+ double p;
+};
+
struct empty
{
};
@@ -362,6 +368,11 @@ public:
if( sizeof( M ) != 8 || sizeof( N ) != 12 || sizeof( O ) != 16 )
abort();
+#ifdef SAL_W32
+ if( sizeof( P ) != 24 )
+ abort();
+#endif
+
#ifndef __GNUC__
// An empty superclass have a size of 0 except for gcc
// FEATURE_EMPTYCLASS
@@ -377,6 +388,7 @@ public:
#endif
static BinaryCompatible_Impl aTest;
+
#endif
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 20:44:34 +0000