summaryrefslogtreecommitdiff
path: root/cppu/source/uno/constr.hxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 12:13:51 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 12:13:51 +0000
commit28b35a7822f5dc7758229c546f988d3592657980 (patch)
treeccd368e1b1be62d54ce9d6ca04129f62219b0a1e /cppu/source/uno/constr.hxx
parent1d3f198ce0d0d708528cf3e53c45743fc94db3fd (diff)
INTEGRATION: CWS warnings01 (1.10.80); FILE MERGED
2005/09/22 20:45:00 sb 1.10.80.2: RESYNC: (1.10-1.11); FILE MERGED 2005/08/29 14:03:52 sb 1.10.80.1: #i53898# Made code warning-free.
Diffstat (limited to 'cppu/source/uno/constr.hxx')
-rw-r--r--cppu/source/uno/constr.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx
index 75a81a5c48ae..46adbacdf8d0 100644
--- a/cppu/source/uno/constr.hxx
+++ b/cppu/source/uno/constr.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: constr.hxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 08:50:56 $
+ * last change: $Author: hr $ $Date: 2006-06-19 13:13:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -136,9 +136,6 @@ inline void _defaultConstructArray(
*((sal_Int32 *)pMem + i) = ((typelib_EnumTypeDescription *)pElementType)->nDefaultEnumValue;
}
break;
- case typelib_TypeClass_TYPEDEF:
- OSL_ENSURE( 0, "### unexpected typedef!" );
- break;
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
for (i=0; i < nTotalElements; i++)
@@ -159,6 +156,9 @@ inline void _defaultConstructArray(
*ppElement = createEmptySequence();
}
break;
+ default:
+ OSL_ASSERT(false);
+ break;
}
TYPELIB_DANGER_RELEASE( pElementType );
}
@@ -221,9 +221,6 @@ inline void _defaultConstructData(
TYPELIB_DANGER_RELEASE( pTypeDescr );
}
break;
- case typelib_TypeClass_TYPEDEF:
- OSL_ENSURE( 0, "### unexpected typedef!" );
- break;
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
if (pTypeDescr)
@@ -267,6 +264,9 @@ inline void _defaultConstructData(
case typelib_TypeClass_INTERFACE:
*(void **)pMem = 0; // either cpp or c-uno interface
break;
+ default:
+ OSL_ASSERT(false);
+ break;
}
}