summaryrefslogtreecommitdiff
path: root/cppu/source/typelib
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2001-03-12 12:28:14 +0000
committerJoachim Lingner <jl@openoffice.org>2001-03-12 12:28:14 +0000
commit40b79cab484d2f5f70962e96696ed5f3645f1c8e (patch)
tree90ca4d10cb0b2962cb0544b94f2a2d5963b534dd /cppu/source/typelib
parentad5b1f6a013e3c9c4623fc35360faec44de50386 (diff)
OSL_ENSHURE replaced by OSL_ENSURE
Diffstat (limited to 'cppu/source/typelib')
-rw-r--r--cppu/source/typelib/static_types.cxx10
-rw-r--r--cppu/source/typelib/typelib.cxx14
2 files changed, 12 insertions, 12 deletions
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 31b56afd6965..03678d13ad41 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: static_types.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: dbo $ $Date: 2001-03-09 12:10:57 $
+ * last change: $Author: jl $ $Date: 2001-03-12 13:25:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -415,7 +415,7 @@ SAL_DLLEXPORT void SAL_CALL typelib_static_compound_type_init(
sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers )
SAL_THROW_EXTERN_C()
{
- OSL_ENSHURE( typelib_TypeClass_STRUCT == eTypeClass ||
+ OSL_ENSURE( typelib_TypeClass_STRUCT == eTypeClass ||
typelib_TypeClass_EXCEPTION == eTypeClass, "### unexpected type class!" );
if (! *ppRef)
@@ -438,7 +438,7 @@ SAL_DLLEXPORT void SAL_CALL typelib_static_compound_type_init(
(typelib_TypeDescription **)&pComp->pBaseTypeDescription, pBaseType );
OSL_ASSERT( pComp->pBaseTypeDescription );
nOffset = ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize;
- OSL_ENSHURE( newAlignedSize( 0, ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize, ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nAlignment ) == ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize, "### unexpected offset!" );
+ OSL_ENSURE( newAlignedSize( 0, ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize, ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nAlignment ) == ((typelib_TypeDescription *)pComp->pBaseTypeDescription)->nSize, "### unexpected offset!" );
}
if (nMembers)
@@ -453,7 +453,7 @@ SAL_DLLEXPORT void SAL_CALL typelib_static_compound_type_init(
// write offset
typelib_TypeDescription * pTD = 0;
TYPELIB_DANGER_GET( &pTD, pComp->ppTypeRefs[i] );
- OSL_ENSHURE( pTD->nSize, "### void member?" );
+ OSL_ENSURE( pTD->nSize, "### void member?" );
nOffset = newAlignedSize( nOffset, pTD->nSize, pTD->nAlignment );
pComp->pMemberOffsets[i] = nOffset - pTD->nSize;
TYPELIB_DANGER_RELEASE( pTD );
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 96c1d9caefdb..71347ced9852 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: typelib.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: dbo $ $Date: 2001-03-12 11:41:15 $
+ * last change: $Author: jl $ $Date: 2001-03-12 13:25:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -729,7 +729,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL typelib_typedescription_new(
typelib_typedescriptionreference_getDescription(
(typelib_TypeDescription **)&pTmp->pBaseTypeDescription, pType );
nOffset = ((typelib_TypeDescription *)pTmp->pBaseTypeDescription)->nSize;
- OSL_ENSHURE( newAlignedSize( 0, ((typelib_TypeDescription *)pTmp->pBaseTypeDescription)->nSize, ((typelib_TypeDescription *)pTmp->pBaseTypeDescription)->nAlignment ) == ((typelib_TypeDescription *)pTmp->pBaseTypeDescription)->nSize, "### unexpected offset!" );
+ OSL_ENSURE( newAlignedSize( 0, ((typelib_TypeDescription *)pTmp->pBaseTypeDescription)->nSize, ((typelib_TypeDescription *)pTmp->pBaseTypeDescription)->nAlignment ) == ((typelib_TypeDescription *)pTmp->pBaseTypeDescription)->nSize, "### unexpected offset!" );
}
if( nMembers )
{
@@ -748,7 +748,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL typelib_typedescription_new(
// write offset
typelib_TypeDescription * pTD = 0;
TYPELIB_DANGER_GET( &pTD, pTmp->ppTypeRefs[i] );
- OSL_ENSHURE( pTD->nSize, "### void member?" );
+ OSL_ENSURE( pTD->nSize, "### void member?" );
nOffset = newAlignedSize( nOffset, pTD->nSize, pTD->nAlignment );
pTmp->pMemberOffsets[i] = nOffset - pTD->nSize;
TYPELIB_DANGER_RELEASE( pTD );
@@ -1471,7 +1471,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
}
break;
case typelib_TypeClass_ARRAY:
- OSL_ENSHURE( sal_False, "not implemented" );
+ OSL_ENSURE( sal_False, "not implemented" );
break;
case typelib_TypeClass_SEQUENCE:
nSize = rMaxIntegralTypeSize = sizeof( void * );
@@ -1524,7 +1524,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
case typelib_TypeClass_SERVICE:
case typelib_TypeClass_MODULE:
default:
- OSL_ENSHURE( sal_False, "not convertable type" );
+ OSL_ENSURE( sal_False, "not convertable type" );
};
}
@@ -1926,7 +1926,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL typelib_typedescriptionreference_assign(
extern "C" SAL_DLLEXPORT void SAL_CALL typelib_setCacheSize( sal_Int32 nNewSize )
SAL_THROW_EXTERN_C()
{
- OSL_ENSHURE( nNewSize >= 0, "### illegal cache size given!" );
+ OSL_ENSURE( nNewSize >= 0, "### illegal cache size given!" );
if (nNewSize >= 0)
{
MutexGuard aGuard( aInit.getMutex() );