diff options
Diffstat (limited to 'binaryurp/source')
-rw-r--r-- | binaryurp/source/bridge.cxx | 10 | ||||
-rw-r--r-- | binaryurp/source/bridgefactory.cxx | 3 | ||||
-rw-r--r-- | binaryurp/source/incomingrequest.cxx | 5 | ||||
-rw-r--r-- | binaryurp/source/proxy.cxx | 10 | ||||
-rw-r--r-- | binaryurp/source/writer.cxx | 7 |
5 files changed, 14 insertions, 21 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 191ca4dc087f..9a02085b3182 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -622,10 +622,9 @@ void Bridge::sendRequestChangeRequest() { assert(mode_ == MODE_REQUESTED); random_ = random(); std::vector< BinaryAny > a; - a.push_back( - BinaryAny( + a.emplace_back( css::uno::TypeDescription(cppu::UnoType< sal_Int32 >::get()), - &random_)); + &random_); sendProtPropRequest(OutgoingRequest::KIND_REQUEST_CHANGE, a); } @@ -865,10 +864,9 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance( css::uno::TypeDescription ifc(cppu::UnoType<css::uno::XInterface>::get()); typelib_TypeDescription * p = ifc.get(); std::vector< BinaryAny > inArgs; - inArgs.push_back( - BinaryAny( + inArgs.emplace_back( css::uno::TypeDescription(cppu::UnoType< css::uno::Type >::get()), - &p)); + &p); BinaryAny ret; std::vector< BinaryAny> outArgs; bool bExc = makeCall( diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index 3a4a99fd091e..fdf80873ac2b 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -126,8 +126,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge( } b.set(new Bridge(this, sName, aConnection, anInstanceProvider)); if (sName.isEmpty()) { - unnamed_.push_back( - css::uno::Reference< css::bridge::XBridge >(b.get())); + unnamed_.emplace_back(b.get()); } else { named_[sName] = b.get(); } diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx index 96307bb23770..9043b22daadf 100644 --- a/binaryurp/source/incomingrequest.cxx +++ b/binaryurp/source/incomingrequest.cxx @@ -212,11 +212,10 @@ bool IncomingRequest::execute_throw( css::uno::TypeDescription( mtd->pParams[j].pTypeRef)); } else { - outBufs.push_back( - std::vector< char >(size_t_round( + outBufs.emplace_back(size_t_round( css::uno::TypeDescription( mtd->pParams[j].pTypeRef). - get()->nSize))); + get()->nSize)); p = &outBufs.back()[0]; } args.push_back(p); diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx index 699037f915dd..d7c7ba410631 100644 --- a/binaryurp/source/proxy.cxx +++ b/binaryurp/source/proxy.cxx @@ -136,14 +136,13 @@ void Proxy::do_dispatch_throw( case typelib_TypeClass_INTERFACE_ATTRIBUTE: bSetter = returnValue == nullptr; if (bSetter) { - inArgs.push_back( - BinaryAny( + inArgs.emplace_back( css::uno::TypeDescription( reinterpret_cast< typelib_InterfaceAttributeTypeDescription const * >( member)-> pAttributeTypeRef), - arguments[0])); + arguments[0]); } break; case typelib_TypeClass_INTERFACE_METHOD: @@ -153,10 +152,9 @@ void Proxy::do_dispatch_throw( typelib_InterfaceMethodTypeDescription const * >(member); for (sal_Int32 i = 0; i != mtd->nParams; ++i) { if (mtd->pParams[i].bIn) { - inArgs.push_back( - BinaryAny( + inArgs.emplace_back( css::uno::TypeDescription(mtd->pParams[i].pTypeRef), - arguments[i])); + arguments[i]); } } break; diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx index e38495d0498c..ba79ee096d55 100644 --- a/binaryurp/source/writer.cxx +++ b/binaryurp/source/writer.cxx @@ -108,7 +108,7 @@ void Writer::queueRequest( { css::uno::UnoInterfaceReference cc(current_context::get()); osl::MutexGuard g(mutex_); - queue_.push_back(Item(tid, oid, type, member, inArguments, cc)); + queue_.emplace_back(tid, oid, type, member, inArguments, cc); items_.set(); } @@ -119,10 +119,9 @@ void Writer::queueReply( std::vector< BinaryAny > const & outArguments, bool setCurrentContextMode) { osl::MutexGuard g(mutex_); - queue_.push_back( - Item( + queue_.emplace_back( tid, member, setter, exception, returnValue, outArguments, - setCurrentContextMode)); + setCurrentContextMode); items_.set(); } |