summaryrefslogtreecommitdiff
path: root/cppu/source/uno/constr.hxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-03-20 11:28:39 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-03-20 11:28:39 +0000
commitf24aa4d9d92d55a7d712d1bdff0f7f180f6c6269 (patch)
treea08d8cca5987c6f9ddfefb9fb5ef5ac5adbeb50d /cppu/source/uno/constr.hxx
parenta4d4df4e3ade39d00091712a13369fa8c609f82c (diff)
INTEGRATION: CWS uno1 (1.8.18); FILE MERGED
2003/02/25 16:41:30 dbo 1.8.18.1: #107762# avoid use of generated headers; minor modifications
Diffstat (limited to 'cppu/source/uno/constr.hxx')
-rw-r--r--cppu/source/uno/constr.hxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx
index 414200f39fd1..0419d63bad43 100644
--- a/cppu/source/uno/constr.hxx
+++ b/cppu/source/uno/constr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: constr.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: dbo $ $Date: 2002-08-21 09:19:22 $
+ * last change: $Author: vg $ $Date: 2003-03-20 12:28:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -162,11 +162,9 @@ inline void _defaultConstructArray(
*((sal_Int32 *)pMem + i) = ((typelib_EnumTypeDescription *)pElementType)->nDefaultEnumValue;
}
break;
-#ifdef CPPU_ASSERTIONS
case typelib_TypeClass_TYPEDEF:
- OSL_ENSURE( sal_False, "### unexpected typedef!" );
+ OSL_ENSURE( 0, "### unexpected typedef!" );
break;
-#endif
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
for (i=0; i < nTotalElements; i++)
@@ -249,11 +247,9 @@ inline void _defaultConstructData(
TYPELIB_DANGER_RELEASE( pTypeDescr );
}
break;
-#ifdef CPPU_ASSERTIONS
case typelib_TypeClass_TYPEDEF:
- OSL_ENSURE( sal_False, "### unexpected typedef!" );
+ OSL_ENSURE( 0, "### unexpected typedef!" );
break;
-#endif
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
if (pTypeDescr)