diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-28 21:11:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-28 22:05:46 +0100 |
| commit | ebdbd2b578c970694597dc163125842e9073bf6c (patch) | |
| tree | 3a5e3dace480276cf6417cfe81f528d88f5f3365 /binaryurp/source/binaryany.cxx | |
| parent | Bogus if(a>b) wrapped in correct if(a>=b). (diff) | |
| download | core-ebdbd2b578c970694597dc163125842e9073bf6c.tar.gz core-ebdbd2b578c970694597dc163125842e9073bf6c.zip | |
Adapted to new assertion/logging mechanisms.
Diffstat (limited to 'binaryurp/source/binaryany.cxx')
| -rw-r--r-- | binaryurp/source/binaryany.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/binaryurp/source/binaryany.cxx b/binaryurp/source/binaryany.cxx index c8c8a4c63a3f..0c510f65a775 100644 --- a/binaryurp/source/binaryany.cxx +++ b/binaryurp/source/binaryany.cxx @@ -28,7 +28,8 @@ #include "sal/config.h" -#include "osl/diagnose.h" +#include <cassert> + #include "typelib/typeclass.h" #include "typelib/typedescription.hxx" #include "uno/any2.h" @@ -50,12 +51,12 @@ BinaryAny::BinaryAny() throw () { BinaryAny::BinaryAny(css::uno::TypeDescription const & type, void * value) throw () { - OSL_ASSERT(type.is()); + assert(type.is()); uno_any_construct(&data_, value, type.get(), 0); } BinaryAny::BinaryAny(uno_Any const & raw) throw () { - OSL_ASSERT(raw.pType != 0); + assert(raw.pType != 0); data_.pType = raw.pType; typelib_typedescriptionreference_acquire(data_.pType); data_.pData = raw.pData == &raw.pReserved ? &data_.pReserved : raw.pData; @@ -88,7 +89,7 @@ css::uno::TypeDescription BinaryAny::getType() const throw () { void * BinaryAny::getValue(css::uno::TypeDescription const & type) const throw () { - OSL_ASSERT( + assert( type.is() && (type.get()->eTypeClass == typelib_TypeClass_ANY || type.equals(css::uno::TypeDescription(data_.pType)))); |