diff options
author | Joachim Lingner <jl@openoffice.org> | 2001-03-12 12:28:14 +0000 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2001-03-12 12:28:14 +0000 |
commit | 40b79cab484d2f5f70962e96696ed5f3645f1c8e (patch) | |
tree | 90ca4d10cb0b2962cb0544b94f2a2d5963b534dd | |
parent | ad5b1f6a013e3c9c4623fc35360faec44de50386 (diff) |
OSL_ENSHURE replaced by OSL_ENSURE
-rw-r--r-- | cppu/source/typelib/static_types.cxx | 10 | ||||
-rw-r--r-- | cppu/source/typelib/typelib.cxx | 14 | ||||
-rw-r--r-- | cppu/source/uno/assign.hxx | 8 | ||||
-rw-r--r-- | cppu/source/uno/constr.hxx | 6 | ||||
-rw-r--r-- | cppu/source/uno/copy.hxx | 12 | ||||
-rw-r--r-- | cppu/source/uno/destr.hxx | 14 | ||||
-rw-r--r-- | cppu/source/uno/eq.hxx | 10 | ||||
-rw-r--r-- | cppu/source/uno/lbenv.cxx | 42 | ||||
-rw-r--r-- | cppu/source/uno/lbmap.cxx | 22 | ||||
-rw-r--r-- | cppu/source/uno/sequence.cxx | 20 | ||||
-rw-r--r-- | cppu/test/surrogate.hxx | 12 | ||||
-rw-r--r-- | cppu/test/test_di.cxx | 50 | ||||
-rw-r--r-- | cppu/test/testcppu.cxx | 20 | ||||
-rw-r--r-- | cppu/test/testthreadpool.cxx | 6 |
14 files changed, 123 insertions, 123 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() ); diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index 2d377de5e26f..d24f07d214bb 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -2,9 +2,9 @@ * * $RCSfile: assign.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dbo $ $Date: 2001-03-12 12:03:40 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:27:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,7 +124,7 @@ inline sal_Bool __queryAndAssignInterface( (*((uno_Interface *)pSource)->pDispatcher)( (uno_Interface *)pSource, pMTqueryInterface, &aRet, aArgs, &pExc ); - OSL_ENSHURE( !pExc, "### Exception occured during queryInterface()!" ); + OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) { __destructAny( pExc, 0 ); @@ -438,7 +438,7 @@ inline sal_Bool __assignData( return sal_False; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); return sal_False; #endif case typelib_TypeClass_STRUCT: diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx index bf6a7e008cd4..6cbe478a046e 100644 --- a/cppu/source/uno/constr.hxx +++ b/cppu/source/uno/constr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: constr.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: dbo $ $Date: 2001-03-09 12:10:57 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:27:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,7 +168,7 @@ inline void __defaultConstructData( break; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index 57a1cd2204fd..76d35ae318fa 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -2,9 +2,9 @@ * * $RCSfile: copy.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dbo $ $Date: 2001-03-12 12:03:40 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:27:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -206,7 +206,7 @@ inline void __copyConstructAnyFromData( break; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_ANY: - OSL_ENSHURE( sal_False, "### unexpected nested any!" ); + OSL_ENSURE( sal_False, "### unexpected nested any!" ); break; #endif case typelib_TypeClass_ENUM: @@ -215,7 +215,7 @@ inline void __copyConstructAnyFromData( break; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: @@ -386,7 +386,7 @@ inline void __copyConstructAny( break; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: @@ -649,7 +649,7 @@ inline void __copyConstructData( break; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index 5ae40624530b..d8b2f70bfc47 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: destr.hxx,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:27:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -137,12 +137,12 @@ inline void __destructAny( ::typelib_typedescriptionreference_release( *(typelib_TypeDescriptionReference **)pAny->pData ); break; case typelib_TypeClass_ANY: - OSL_ENSHURE( sal_False, "### unexpected nested any!" ); + OSL_ENSURE( sal_False, "### unexpected nested any!" ); ::uno_any_destruct( (uno_Any *)pAny->pData, release ); break; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: @@ -245,7 +245,7 @@ inline sal_Int32 __destructElements( return sizeof(int); #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: @@ -298,7 +298,7 @@ inline sal_Int32 __destructElements( } #ifdef CPPU_ASSERTIONS case typelib_TypeClass_ARRAY: - OSL_ENSHURE( sal_False, "### unexpected array!" ); + OSL_ENSURE( sal_False, "### unexpected array!" ); break; #endif case typelib_TypeClass_INTERFACE: @@ -377,7 +377,7 @@ inline void __destructData( break; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index 497ba7bbfabb..717c1d934fed 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -2,9 +2,9 @@ * * $RCSfile: eq.hxx,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:27:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,7 +102,7 @@ inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 ) (*((uno_Interface *)pUnoI1)->pDispatcher)( (uno_Interface *)pUnoI1, pMTqueryInterface, &aRet1, pArgs, &pExc ); - OSL_ENSHURE( !pExc, "### Exception occured during queryInterface()!" ); + OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) { __destructAny( pExc, 0 ); @@ -115,7 +115,7 @@ inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 ) (*((uno_Interface *)pUnoI2)->pDispatcher)( (uno_Interface *)pUnoI2, pMTqueryInterface, &aRet2, pArgs, &pExc ); - OSL_ENSHURE( !pExc, "### Exception occured during queryInterface()!" ); + OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) { __destructAny( pExc, 0 ); @@ -674,7 +674,7 @@ inline sal_Bool __equalData( *(int *)pDest == *(int *)pSource); #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index d12dba7158c1..d94e098ea976 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lbenv.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: dbo $ $Date: 2001-03-09 12:10:57 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:27:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -313,7 +313,7 @@ static void SAL_CALL defenv_registerInterface( rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" ); + OSL_ENSURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" ); const OUString & rOId = * reinterpret_cast< OUString * >( &pOId ); ClearableMutexGuard aGuard( static_cast< uno_DefaultEnvironment * >( pEnv )->aAccess ); @@ -356,7 +356,7 @@ static void SAL_CALL defenv_registerProxyInterface( rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" ); + OSL_ENSURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" ); const OUString & rOId = * reinterpret_cast< OUString * >( &pOId ); ClearableMutexGuard aGuard( static_cast< uno_DefaultEnvironment * >( pEnv )->aAccess ); @@ -399,7 +399,7 @@ static void SAL_CALL defenv_revokeInterface( uno_ExtEnvironment * pEnv, void * pInterface ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv && pInterface, "### null ptr!" ); + OSL_ENSURE( pEnv && pInterface, "### null ptr!" ); ClearableMutexGuard aGuard( static_cast< uno_DefaultEnvironment * >( pEnv )->aAccess ); const Ptr2ObjectMap::const_iterator iFind( @@ -441,7 +441,7 @@ static void SAL_CALL defenv_getObjectIdentifier( uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv && ppOId && pInterface, "### null ptr!" ); + OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" ); if (*ppOId) { ::rtl_uString_release( *ppOId ); @@ -468,7 +468,7 @@ static void SAL_CALL defenv_getRegisteredInterface( rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" ); + OSL_ENSURE( pEnv && ppInterface && pOId && pTypeDescr, "### null ptr!" ); if (*ppInterface) { (*pEnv->releaseInterface)( pEnv, *ppInterface ); @@ -493,7 +493,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces( uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen, uno_memAlloc memAlloc ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv && pppInterfaces && pnLen && memAlloc, "### null ptr!" ); + OSL_ENSURE( pEnv && pppInterfaces && pnLen && memAlloc, "### null ptr!" ); MutexGuard aGuard( static_cast< uno_DefaultEnvironment * >( pEnv )->aAccess ); sal_Int32 nLen = static_cast< uno_DefaultEnvironment * >( pEnv )->aPtr2ObjectMap.size(); @@ -569,7 +569,7 @@ uno_DefaultEnvironment::uno_DefaultEnvironment( //__________________________________________________________________________________________________ uno_DefaultEnvironment::~uno_DefaultEnvironment() SAL_THROW( () ) { - OSL_ENSHURE( aOId2ObjectMap.empty(), "### object entries left!" ); + OSL_ENSURE( aOId2ObjectMap.empty(), "### object entries left!" ); uno_Environment * that = (uno_Environment *)this; if (that->environmentDisposing) @@ -640,7 +640,7 @@ extern "C" SAL_DLLEXPORT void SAL_CALL uno_dumpEnvironment( void * stream, uno_Environment * pEnv, const sal_Char * pFilter ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv, "### null ptr!" ); + OSL_ENSURE( pEnv, "### null ptr!" ); OUStringBuffer buf; if (! pEnv->pExtEnv) @@ -758,7 +758,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier( uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv && ppOId && pInterface, "### null ptr!" ); + OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" ); if (*ppOId) { ::rtl_uString_release( *ppOId ); @@ -777,14 +777,14 @@ static void SAL_CALL unoenv_computeObjectIdentifier( (*((uno_Interface *)pInterface)->pDispatcher)( (uno_Interface *)pInterface, pMTqueryInterface, &aRet, pArgs, &pExc ); - OSL_ENSHURE( !pExc, "### Exception occured during queryInterface()!" ); + OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) // cleanup exception object { __destructAny( pExc, 0 ); } else { - OSL_ENSHURE( aRet.pType->eTypeClass == typelib_TypeClass_INTERFACE, + OSL_ENSURE( aRet.pType->eTypeClass == typelib_TypeClass_INTERFACE, "### cannot query for XInterface!" ); if (aRet.pType->eTypeClass == typelib_TypeClass_INTERFACE) { @@ -827,7 +827,7 @@ EnvironmentsData::~EnvironmentsData() SAL_THROW( () ) OUString2EnvironmentMap::const_iterator iPos( aName2EnvMap.begin() ); #ifdef CPPU_ALLOW_ASSERTIONS - OSL_ENSHURE( aName2EnvMap.empty(), "### unrevoked environments! living proxies?" ); + OSL_ENSURE( aName2EnvMap.empty(), "### unrevoked environments! living proxies?" ); while (iPos != aName2EnvMap.end()) { ::uno_dumpEnvironment( 0, (*iPos).second, 0 ); @@ -871,14 +871,14 @@ inline uno_Environment * EnvironmentsData::getEnvironment( inline sal_Bool EnvironmentsData::registerEnvironment( uno_Environment * pEnv ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv, "### null ptr!" ); + OSL_ENSURE( pEnv, "### null ptr!" ); OUString aKey( OUString::valueOf( (sal_Int64)pEnv->pContext ) ); aKey += pEnv->pTypeName; // try to find environment MutexGuard aGuard( aMutex ); const OUString2EnvironmentMap::const_iterator iFind( aName2EnvMap.find( aKey ) ); - OSL_ENSHURE( iFind == aName2EnvMap.end(), "### environment already registered!" ); + OSL_ENSURE( iFind == aName2EnvMap.end(), "### environment already registered!" ); if (iFind == aName2EnvMap.end()) { aName2EnvMap[ aKey ] = pEnv; @@ -890,12 +890,12 @@ inline sal_Bool EnvironmentsData::registerEnvironment( uno_Environment * pEnv ) inline sal_Bool EnvironmentsData::revokeEnvironment( uno_Environment * pEnv ) SAL_THROW( () ) { - OSL_ENSHURE( pEnv, "### null ptr!" ); + OSL_ENSURE( pEnv, "### null ptr!" ); OUString aKey( OUString::valueOf( (sal_Int64)pEnv->pContext ) ); aKey += pEnv->pTypeName; MutexGuard aGuard( aMutex ); - OSL_ENSHURE( aName2EnvMap.find( aKey ) != aName2EnvMap.end(), "### env reg error!" ); + OSL_ENSURE( aName2EnvMap.find( aKey ) != aName2EnvMap.end(), "### env reg error!" ); aName2EnvMap.erase( aKey ); return sal_True; } @@ -905,7 +905,7 @@ inline void EnvironmentsData::getRegisteredEnvironments( const OUString & rEnvTypeName ) SAL_THROW( () ) { - OSL_ENSHURE( pppEnvs && pnLen && memAlloc, "### null ptr!" ); + OSL_ENSURE( pppEnvs && pnLen && memAlloc, "### null ptr!" ); uno_Environment ** ppFound; sal_Int32 nSize = 0; @@ -1017,7 +1017,7 @@ SAL_DLLEXPORT void SAL_CALL uno_createEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvTypeName, void * pContext ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( ppEnv, "### null ptr!" ); + OSL_ENSURE( ppEnv, "### null ptr!" ); if (*ppEnv) (*(*ppEnv)->release)( *ppEnv ); @@ -1031,7 +1031,7 @@ SAL_DLLEXPORT void SAL_CALL uno_getEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvTypeName, void * pContext ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( ppEnv, "### null ptr!" ); + OSL_ENSURE( ppEnv, "### null ptr!" ); if (*ppEnv) (*(*ppEnv)->release)( *ppEnv ); diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index d7b6b5174eb2..0b361e36337f 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lbmap.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: dbo $ $Date: 2001-03-12 11:46:19 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:27:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,7 +169,7 @@ struct MappingsData MappingsData::~MappingsData() SAL_THROW( () ) { #ifdef CPPU_ASSERTIONS - OSL_ENSHURE( aName2Entry.empty() && aMapping2Entry.empty(), "### unrevoked mappings!" ); + OSL_ENSURE( aName2Entry.empty() && aMapping2Entry.empty(), "### unrevoked mappings!" ); t_OUString2Entry::const_iterator iPos( aName2Entry.begin() ); while (iPos != aName2Entry.end()) { @@ -178,7 +178,7 @@ MappingsData::~MappingsData() SAL_THROW( () ) CPPU_TRACE( "### unrevoked mapping: %s", aName.getStr() ); ++iPos; } - OSL_ENSHURE( aCallbacks.empty(), "### callbacks left!" ); + OSL_ENSURE( aCallbacks.empty(), "### callbacks left!" ); if (aCallbacks.size()) { OString aSize( OString::valueOf( (sal_Int32)aCallbacks.size() ) ); @@ -263,7 +263,7 @@ static void SAL_CALL mediate_mapInterface( typelib_InterfaceTypeDescription * pInterfaceTypeDescr ) SAL_THROW( () ) { - OSL_ENSHURE( pMapping && ppOut, "### null ptr!" ); + OSL_ENSURE( pMapping && ppOut, "### null ptr!" ); if (pMapping && ppOut) { uno_Interface * pUnoI = 0; @@ -532,7 +532,7 @@ SAL_DLLEXPORT void SAL_CALL uno_getMapping( rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( ppMapping && pFrom && pTo, "### null ptr!" ); + OSL_ENSURE( ppMapping && pFrom && pTo, "### null ptr!" ); if (*ppMapping) { (*(*ppMapping)->release)( *ppMapping ); @@ -588,7 +588,7 @@ SAL_DLLEXPORT void SAL_CALL uno_getMappingByName( rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( ppMapping && pFrom && pTo, "### null ptr!" ); + OSL_ENSURE( ppMapping && pFrom && pTo, "### null ptr!" ); if (*ppMapping) { (*(*ppMapping)->release)( *ppMapping ); @@ -597,12 +597,12 @@ SAL_DLLEXPORT void SAL_CALL uno_getMappingByName( uno_Environment * pEFrom = 0; uno_getEnvironment( &pEFrom, pFrom, 0 ); - OSL_ENSHURE( pEFrom, "### cannot get source environment!" ); + OSL_ENSURE( pEFrom, "### cannot get source environment!" ); if (pEFrom) { uno_Environment * pETo = 0; uno_getEnvironment( &pETo, pTo, 0 ); - OSL_ENSHURE( pETo, "### cannot get target environment!" ); + OSL_ENSURE( pETo, "### cannot get target environment!" ); if (pETo) { ::uno_getMapping( ppMapping, pEFrom, pETo, pAddPurpose ); @@ -680,7 +680,7 @@ SAL_DLLEXPORT void SAL_CALL uno_registerMappingCallback( uno_getMappingFunc pCallback ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( pCallback, "### null ptr!" ); + OSL_ENSURE( pCallback, "### null ptr!" ); MappingsData & rData = getMappingsData(); MutexGuard aGuard( rData.aCallbacksMutex ); rData.aCallbacks.insert( pCallback ); @@ -690,7 +690,7 @@ SAL_DLLEXPORT void SAL_CALL uno_revokeMappingCallback( uno_getMappingFunc pCallback ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( pCallback, "### null ptr!" ); + OSL_ENSURE( pCallback, "### null ptr!" ); MappingsData & rData = getMappingsData(); MutexGuard aGuard( rData.aCallbacksMutex ); rData.aCallbacks.erase( pCallback ); diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 68aa833940af..24544a67ab9e 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sequence.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dbo $ $Date: 2001-03-09 12:10:57 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:27:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -233,7 +233,7 @@ static inline void __defaultConstructElements( } #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: @@ -421,7 +421,7 @@ static inline void __copyConstructElements( } #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: - OSL_ENSHURE( sal_False, "### unexpected typedef!" ); + OSL_ENSURE( sal_False, "### unexpected typedef!" ); break; #endif case typelib_TypeClass_STRUCT: @@ -676,8 +676,8 @@ SAL_DLLEXPORT void SAL_CALL uno_type_sequence_realloc( uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( ppSequence, "### null ptr!" ); - OSL_ENSHURE( nSize >= 0, "### new size must be at least 0!" ); + OSL_ENSURE( ppSequence, "### null ptr!" ); + OSL_ENSURE( nSize >= 0, "### new size must be at least 0!" ); if (nSize != (*ppSequence)->nElements) { @@ -695,8 +695,8 @@ SAL_DLLEXPORT void SAL_CALL uno_sequence_realloc( uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( ppSequence, "### null ptr!" ); - OSL_ENSHURE( nSize >= 0, "### new size must be at least 0!" ); + OSL_ENSURE( ppSequence, "### null ptr!" ); + OSL_ENSURE( nSize >= 0, "### new size must be at least 0!" ); if (nSize != (*ppSequence)->nElements) { @@ -712,7 +712,7 @@ SAL_DLLEXPORT void SAL_CALL uno_type_sequence_reference2One( uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( ppSequence, "### null ptr!" ); + OSL_ENSURE( ppSequence, "### null ptr!" ); uno_Sequence * pSequence = *ppSequence; if (pSequence->nRefCount > 1) { @@ -751,7 +751,7 @@ SAL_DLLEXPORT void SAL_CALL uno_sequence_reference2One( uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - OSL_ENSHURE( ppSequence, "### null ptr!" ); + OSL_ENSURE( ppSequence, "### null ptr!" ); uno_Sequence * pSequence = *ppSequence; if (pSequence->nRefCount > 1) { diff --git a/cppu/test/surrogate.hxx b/cppu/test/surrogate.hxx index bb60f491055e..a723c2d402e0 100644 --- a/cppu/test/surrogate.hxx +++ b/cppu/test/surrogate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: surrogate.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:25:54 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:28:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,7 +127,7 @@ inline sal_Bool makeSurrogate( com::sun::star::uno::Reference< T > & rOut, typelib_TypeDescription * pTD = 0; const com::sun::star::uno::Type & rType = ::getCppuType( &rOriginal ); TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() ); - OSL_ENSHURE( pTD, "### cannot get typedescription!" ); + OSL_ENSURE( pTD, "### cannot get typedescription!" ); if (pTD) { uno_Environment * pCppEnv1 = 0; @@ -153,13 +153,13 @@ inline sal_Bool makeSurrogate( com::sun::star::uno::Reference< T > & rOut, /* ::com::sun::star::uno::Mapping aCpp2Uno( CPPU_CURRENT_LANGUAGE_BINDING_NAME, UNO_LB_UNO ); ::com::sun::star::uno::Mapping aUno2Cpp( UNO_LB_UNO, CPPU_CURRENT_LANGUAGE_BINDING_NAME ); - OSL_ENSHURE( aCpp2Uno.is() && aUno2Cpp.is(), "### cannot get mappings!" ); + OSL_ENSURE( aCpp2Uno.is() && aUno2Cpp.is(), "### cannot get mappings!" ); if (aCpp2Uno.is() && aUno2Cpp.is()) { typelib_TypeDescription * pTD = 0; const com::sun::star::uno::Type & rType = ::getCppuType( &rOriginal ); TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() ); - OSL_ENSHURE( pTD, "### cannot get typedescription!" ); + OSL_ENSURE( pTD, "### cannot get typedescription!" ); if (pTD) { uno_Interface * pUno = (uno_Interface *)aCpp2Uno.mapInterface( @@ -168,7 +168,7 @@ inline sal_Bool makeSurrogate( com::sun::star::uno::Reference< T > & rOut, { UnoMediator * pPseudo = new UnoMediator( pUno ); (*pPseudo->acquire)( pPseudo ); - OSL_ENSHURE( uno_equals( &pUno, &pPseudo, pTD, 0 ), "### interfaces don't belong to same object, but they do!?" ); + OSL_ENSURE( uno_equals( &pUno, &pPseudo, pTD, 0 ), "### interfaces don't belong to same object, but they do!?" ); (*pUno->release)( pUno ); T * pCpp = (T *)aUno2Cpp.mapInterface( diff --git a/cppu/test/test_di.cxx b/cppu/test/test_di.cxx index 82198b1613e4..d8f804989d67 100644 --- a/cppu/test/test_di.cxx +++ b/cppu/test/test_di.cxx @@ -2,9 +2,9 @@ * * $RCSfile: test_di.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dbo $ $Date: 2001-02-28 15:34:46 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:28:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,21 +88,21 @@ using namespace rtl; //================================================================================================== sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rData2 ) { - OSL_ENSHURE( rData1.Bool == rData2.Bool, "### bool does not match!" ); - OSL_ENSHURE( rData1.Char == rData2.Char, "### char does not match!" ); - OSL_ENSHURE( rData1.Byte == rData2.Byte, "### byte does not match!" ); - OSL_ENSHURE( rData1.Short == rData2.Short, "### short does not match!" ); - OSL_ENSHURE( rData1.UShort == rData2.UShort, "### unsigned short does not match!" ); - OSL_ENSHURE( rData1.Long == rData2.Long, "### long does not match!" ); - OSL_ENSHURE( rData1.ULong == rData2.ULong, "### unsigned long does not match!" ); - OSL_ENSHURE( rData1.Hyper == rData2.Hyper, "### hyper does not match!" ); - OSL_ENSHURE( rData1.UHyper == rData2.UHyper, "### unsigned hyper does not match!" ); - OSL_ENSHURE( rData1.Float == rData2.Float, "### float does not match!" ); - OSL_ENSHURE( rData1.Double == rData2.Double, "### double does not match!" ); - OSL_ENSHURE( rData1.Enum == rData2.Enum, "### enum does not match!" ); - OSL_ENSHURE( rData1.String == rData2.String, "### string does not match!" ); - OSL_ENSHURE( rData1.Interface == rData2.Interface, "### interface does not match!" ); - OSL_ENSHURE( rData1.Any == rData2.Any, "### any does not match!" ); + OSL_ENSURE( rData1.Bool == rData2.Bool, "### bool does not match!" ); + OSL_ENSURE( rData1.Char == rData2.Char, "### char does not match!" ); + OSL_ENSURE( rData1.Byte == rData2.Byte, "### byte does not match!" ); + OSL_ENSURE( rData1.Short == rData2.Short, "### short does not match!" ); + OSL_ENSURE( rData1.UShort == rData2.UShort, "### unsigned short does not match!" ); + OSL_ENSURE( rData1.Long == rData2.Long, "### long does not match!" ); + OSL_ENSURE( rData1.ULong == rData2.ULong, "### unsigned long does not match!" ); + OSL_ENSURE( rData1.Hyper == rData2.Hyper, "### hyper does not match!" ); + OSL_ENSURE( rData1.UHyper == rData2.UHyper, "### unsigned hyper does not match!" ); + OSL_ENSURE( rData1.Float == rData2.Float, "### float does not match!" ); + OSL_ENSURE( rData1.Double == rData2.Double, "### double does not match!" ); + OSL_ENSURE( rData1.Enum == rData2.Enum, "### enum does not match!" ); + OSL_ENSURE( rData1.String == rData2.String, "### string does not match!" ); + OSL_ENSURE( rData1.Interface == rData2.Interface, "### interface does not match!" ); + OSL_ENSURE( rData1.Any == rData2.Any, "### any does not match!" ); return (rData1.Bool == rData2.Bool && rData1.Char == rData2.Char && @@ -136,7 +136,7 @@ sal_Bool equals( const test::TestData & rData1, const test::TestData & rData2 ) { if (! equals( pElements1[nLen], pElements2[nLen] )) { - OSL_ENSHURE( sal_False, "### sequence element did not match!" ); + OSL_ENSURE( sal_False, "### sequence element did not match!" ); return sal_False; } } @@ -385,7 +385,7 @@ test::TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_In //================================================================================================== sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) { - OSL_ENSHURE( xLBT.is(), "### no test interface!" ); + OSL_ENSURE( xLBT.is(), "### no test interface!" ); if (xLBT.is()) { // this data is never ever granted access to by calls other than equals(), assign()! @@ -400,8 +400,8 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) OUString::createFromAscii("dumdidum"), xI, Any( &xI, ::getCppuType( (const Reference<XInterface > *)0 ) ) ); - OSL_ENSHURE( aData.Any == xI, "### unexpected any!" ); - OSL_ENSHURE( !(aData.Any != xI), "### unexpected any!" ); + OSL_ENSURE( aData.Any == xI, "### unexpected any!" ); + OSL_ENSURE( !(aData.Any != xI), "### unexpected any!" ); aData.Sequence = Sequence<test::TestElement >( (const test::TestElement *)&aData, 1 ); // aData complete @@ -541,7 +541,7 @@ sal_Bool raiseException( const Reference< XLanguageBindingTest > & xLBT ) catch (IllegalArgumentException aExc) { ++nCount; - OSL_ENSHURE( aExc.ArgumentPosition == 5 && + OSL_ENSURE( aExc.ArgumentPosition == 5 && aExc.Context == xLBT->getInterface() && aExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...") ), "### unexpected exception content!" ); @@ -553,7 +553,7 @@ sal_Bool raiseException( const Reference< XLanguageBindingTest > & xLBT ) catch (const RuntimeException & rExc) { ++nCount; - OSL_ENSHURE( rExc.Context == xLBT->getInterface() && + OSL_ENSURE( rExc.Context == xLBT->getInterface() && rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...") ), "### unexpected exception content!" ); @@ -564,7 +564,7 @@ sal_Bool raiseException( const Reference< XLanguageBindingTest > & xLBT ) catch (Exception & rExc) { ++nCount; - OSL_ENSHURE( rExc.Context == xLBT->getInterface() && + OSL_ENSURE( rExc.Context == xLBT->getInterface() && rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...") ), "### unexpected exception content!" ); return (nCount == 3 && @@ -592,7 +592,7 @@ void test_di(void) Mapping aMapping( pCppEnv1, pCppEnv2, OUString::createFromAscii("prot") ); aMapping.mapInterface( (void **)&xLBT, xOriginal.get(), ::getCppuType( &xOriginal ) ); - OSL_ENSHURE( aMapping.is(), "### cannot get mapping!" ); + OSL_ENSURE( aMapping.is(), "### cannot get mapping!" ); (*pCppEnv2->release)( pCppEnv2 ); (*pCppEnv1->release)( pCppEnv1 ); diff --git a/cppu/test/testcppu.cxx b/cppu/test/testcppu.cxx index 3c8b7173937b..b6e154ae99e6 100644 --- a/cppu/test/testcppu.cxx +++ b/cppu/test/testcppu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testcppu.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dbo $ $Date: 2001-03-09 14:25:52 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:28:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,13 +115,13 @@ void testCppu() { { // test the size of types - OSL_ENSHURE( sizeof( Uik ) == getSize( getCppuType( (Uik *)0) ), + OSL_ENSURE( sizeof( Uik ) == getSize( getCppuType( (Uik *)0) ), "bad sizeof uik" ); - OSL_ENSHURE( sizeof( Test1 ) == getSize( getCppuType( (Test1*)0).getTypeLibType() ), + OSL_ENSURE( sizeof( Test1 ) == getSize( getCppuType( (Test1*)0).getTypeLibType() ), "bad sizeof test1" ); -// OSL_ENSHURE( sizeof( TdTest1 ) == getSize( get_test_TdTest1_Type().getTypeLibType() ), +// OSL_ENSURE( sizeof( TdTest1 ) == getSize( get_test_TdTest1_Type().getTypeLibType() ), // "bad sizeof TypedefTest1" ); - OSL_ENSHURE( sizeof( Test2 ) == getSize( getCppuType( (Test2*)0).getTypeLibType() ), + OSL_ENSURE( sizeof( Test2 ) == getSize( getCppuType( (Test2*)0).getTypeLibType() ), "bad sizeof test2" ); /* find the error @@ -143,7 +143,7 @@ nPos = (sal_Int32)&((Test3 *)0)->td; nPos = (sal_Int32)&((Test3 *)0)->bBool; nPos = (sal_Int32)&((Test3 *)0)->aAny; */ - OSL_ENSHURE( sizeof( Test3 ) == getSize( getCppuType( (Test3*)0).getTypeLibType() ), + OSL_ENSURE( sizeof( Test3 ) == getSize( getCppuType( (Test3*)0).getTypeLibType() ), "bad sizeof test3" ); } @@ -712,7 +712,7 @@ void SAL_CALL typedescription_Callback_1 rtl_uString * pTypeName ) { - OSL_ENSHURE( pContext == (void *)1, "### unexpected context!" ); + OSL_ENSURE( pContext == (void *)1, "### unexpected context!" ); if( *ppRet ) { typelib_typedescription_release( *ppRet ); @@ -744,7 +744,7 @@ void SAL_CALL typedescription_Callback rtl_uString * pTypeName ) { - OSL_ENSHURE( pContext == (void *)0, "### unexpected context!" ); + OSL_ENSURE( pContext == (void *)0, "### unexpected context!" ); if( *ppRet ) { typelib_typedescription_release( *ppRet ); @@ -886,7 +886,7 @@ int SAL_CALL main(int argc, char **argv) // shutdown #ifdef SAL_W32 Reference< XComponent > xComp( xMgr, UNO_QUERY ); - OSL_ENSHURE( xComp.is(), "### serivce manager has to implement XComponent!" ); + OSL_ENSURE( xComp.is(), "### serivce manager has to implement XComponent!" ); xComp->dispose(); xMgr.clear(); #endif diff --git a/cppu/test/testthreadpool.cxx b/cppu/test/testthreadpool.cxx index 2f2f84499599..6910091dd111 100644 --- a/cppu/test/testthreadpool.cxx +++ b/cppu/test/testthreadpool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: testthreadpool.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:25:53 $ + * last change: $Author: jl $ $Date: 2001-03-12 13:28:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ #include <vos/thread.hxx> -#define TEST_ENSURE OSL_ENSHURE +#define TEST_ENSURE OSL_ENSURE using namespace ::vos; |