diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:14:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:14:17 +0000 |
| commit | 965ca6e3b093c724ac5a06530631af050f96e503 (patch) | |
| tree | 06a47919e2cb2f0d6ea5890b0db0b3cf7d41e3f9 | |
| parent | 2febeaf8e249d1eae93462d432ce9605cae22704 (diff) | |
INTEGRATION: CWS warnings01 (1.12.34); FILE MERGED
2005/09/22 20:45:33 sb 1.12.34.2: RESYNC: (1.12-1.13); FILE MERGED
2005/08/29 14:03:53 sb 1.12.34.1: #i53898# Made code warning-free.
| -rw-r--r-- | cppu/source/uno/destr.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index 4a6a7217c4ae..6c57b06c65a2 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -4,9 +4,9 @@ * * $RCSfile: destr.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:52:07 $ + * last change: $Author: hr $ $Date: 2006-06-19 13:14:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -189,6 +189,8 @@ inline void _destructAny( case typelib_TypeClass_INTERFACE: _release( pAny->pReserved, release ); break; + default: + break; } #if OSL_DEBUG_LEVEL > 0 pAny->pData = (void *)0xdeadbeef; @@ -254,9 +256,6 @@ inline sal_Int32 idestructElements( } case typelib_TypeClass_ENUM: return (sal_Int32)(sizeof(sal_Int32)); - case typelib_TypeClass_TYPEDEF: - OSL_ENSURE( 0, "### unexpected typedef!" ); - break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: { @@ -305,9 +304,6 @@ inline sal_Int32 idestructElements( TYPELIB_DANGER_RELEASE( pElementTypeDescr ); return (sal_Int32)(sizeof(uno_Sequence *)); } - case typelib_TypeClass_ARRAY: - OSL_ENSURE( 0, "### unexpected array!" ); - break; case typelib_TypeClass_INTERFACE: { if (release) @@ -334,8 +330,10 @@ inline sal_Int32 idestructElements( } return (sal_Int32)(sizeof(void *)); } + default: + OSL_ASSERT(false); + return 0; } - return 0; } //------------------------------------------------------------------------------ @@ -438,6 +436,8 @@ inline void _destructData( case typelib_TypeClass_INTERFACE: _release( *(void **)pValue, release ); break; + default: + break; } } |