summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 12:10:42 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:19:48 +0100
commitadc6fe00e3ef3cca5bbd49a4633181856bf111df (patch)
treeea50caa8979aa23d77f912bee478d968ccf18232 /cppu
parent629b05ac304a47f70180d044ac5db18a9ecfc9cc (diff)
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/uno/copy.hxx4
-rw-r--r--cppu/source/uno/data.cxx2
-rw-r--r--cppu/source/uno/destr.hxx4
-rw-r--r--cppu/source/uno/sequence.cxx4
4 files changed, 7 insertions, 7 deletions
diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx
index 7750a686b694..eee6363e6998 100644
--- a/cppu/source/uno/copy.hxx
+++ b/cppu/source/uno/copy.hxx
@@ -252,7 +252,7 @@ inline void _copyConstructAnyFromData(
*(typelib_TypeDescriptionReference **)&pDestAny->pReserved = *(typelib_TypeDescriptionReference **)pSource;
break;
case typelib_TypeClass_ANY:
- OSL_ENSURE( 0, "### unexpected nested any!" );
+ OSL_FAIL( "### unexpected nested any!" );
break;
case typelib_TypeClass_ENUM:
pDestAny->pData = &pDestAny->pReserved;
@@ -729,7 +729,7 @@ inline uno_Sequence * icopyConstructSequence(
break;
}
default:
- OSL_ENSURE( 0, "### unexepcted sequence element type!" );
+ OSL_FAIL( "### unexepcted sequence element type!" );
pDest = 0;
break;
}
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index ea0b8b2ad6b6..9e3e09a0e972 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -115,7 +115,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p
buf.append( * reinterpret_cast< OUString const * >( pExc->pData ) );
OString cstr(
OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_ENSURE( 0, cstr.getStr() );
+ OSL_FAIL( cstr.getStr() );
#endif
uno_any_destruct( pExc, 0 );
}
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx
index 0dc28386afed..ce64f2d82e7f 100644
--- a/cppu/source/uno/destr.hxx
+++ b/cppu/source/uno/destr.hxx
@@ -152,7 +152,7 @@ inline void _destructAny(
::rtl_freeMemory( pAny->pData );
break;
case typelib_TypeClass_TYPEDEF:
- OSL_ENSURE( 0, "### unexpected typedef!" );
+ OSL_FAIL( "### unexpected typedef!" );
break;
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
@@ -381,7 +381,7 @@ inline void _destructData(
_destructAny( (uno_Any *)pValue, release );
break;
case typelib_TypeClass_TYPEDEF:
- OSL_ENSURE( 0, "### unexpected typedef!" );
+ OSL_FAIL( "### unexpected typedef!" );
break;
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 947e803cb76a..6374c773cb86 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -351,7 +351,7 @@ static inline bool idefaultConstructElements(
}
break;
default:
- OSL_ENSURE( 0, "### unexpected element type!" );
+ OSL_FAIL( "### unexpected element type!" );
pSeq = 0;
break;
}
@@ -665,7 +665,7 @@ static inline bool icopyConstructFromElements(
break;
}
default:
- OSL_ENSURE( 0, "### unexpected element type!" );
+ OSL_FAIL( "### unexpected element type!" );
pSeq = 0;
break;
}