diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-01-27 23:49:51 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-03-24 16:37:54 +0000 |
| commit | ec60e33dd83b1bdec01b2c4a1dbaa15e92c9f6b5 (patch) | |
| tree | 888877f9648da6d6932636e570ddfe2ade8ed781 /binaryurp | |
| parent | 436745ea87a642789b5960eae7efd8d1e09eb512 (diff) | |
Cleanup previous commit etc.
Diffstat (limited to 'binaryurp')
| -rw-r--r-- | binaryurp/source/bridge.cxx | 2 | ||||
| -rw-r--r-- | binaryurp/source/writer.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 54214c393dd5..0f0cbb2db03b 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -286,7 +286,7 @@ void Bridge::terminate(bool final) { } w = writer_; joinW = !isThread(writer_.get()); - assert(!final || joinW); + assert(!final || joinW); // horror crash here ? .... if (joinW) { writer_.clear(); } diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx index a2e2d3818528..80366b62df76 100644 --- a/binaryurp/source/writer.cxx +++ b/binaryurp/source/writer.cxx @@ -118,7 +118,7 @@ void Writer::queueRequest( items_.set(); SAL_DEBUG("writer::queueRequest tid " << getAsString(tid) << - " type " << OUString(type.get()->pTypeName) << +// " type " << OUString(type.get()->pTypeName) << " member " << OUString(member.get()->pTypeName)); } @@ -215,10 +215,10 @@ void Writer::sendRequest( css::uno::UnoInterfaceReference const & currentContext) { SAL_DEBUG("writer::sendRequest tid " << getAsString(tid) << - " type " << OUString(type.get()->pTypeName) << +// " type " << OUString(type.get()->pTypeName) << " member " << OUString(member.get()->pTypeName) << - " cctx mode? " << currentContextMode << - " cur ctx " << currentContext.get()); + " cctx mode? " << currentContextMode); +// " cur ctx " << currentContext.get()); - currentContext ref -> null OSL_ASSERT(tid.getLength() != 0 && !oid.isEmpty() && member.is()); css::uno::TypeDescription t(type); |