diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index bc127b0716f..cc951c7b614 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -363,8 +363,8 @@ class ICE_API ObjectPrx : public ::std::enable_shared_from_this ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) { - return _makeLamdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, - &ObjectPrx::_iceI_isA, typeId, context); + return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, + &ObjectPrx::_iceI_isA, typeId, context); } /** @@ -409,8 +409,8 @@ class ICE_API ObjectPrx : public ::std::enable_shared_from_this ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) { - return _makeLamdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, - &ObjectPrx::_iceI_ping, context); + return _makeLambdaOutgoing(std::move(response), std::move(ex), std::move(sent), this, + &ObjectPrx::_iceI_ping, context); } /** @@ -456,8 +456,8 @@ class ICE_API ObjectPrx : public ::std::enable_shared_from_this ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) { - return _makeLamdaOutgoing<::std::vector<::std::string>>(std::move(response), std::move(ex), std::move(sent), - this, &ObjectPrx::_iceI_ids, context); + return _makeLambdaOutgoing<::std::vector<::std::string>>(std::move(response), std::move(ex), std::move(sent), + this, &ObjectPrx::_iceI_ids, context); } /** @@ -502,8 +502,8 @@ class ICE_API ObjectPrx : public ::std::enable_shared_from_this ::std::function sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) { - return _makeLamdaOutgoing<::std::string>(std::move(response), std::move(ex), std::move(sent), this, - &ObjectPrx::_iceI_id, context); + return _makeLambdaOutgoing<::std::string>(std::move(response), std::move(ex), std::move(sent), this, + &ObjectPrx::_iceI_id, context); } /** @@ -1147,7 +1147,7 @@ class ICE_API ObjectPrx : public ::std::enable_shared_from_this } template - ::std::function _makeLamdaOutgoing(Re r, E e, S s, Obj obj, Fn fn, Args&&... args) + ::std::function _makeLambdaOutgoing(Re r, E e, S s, Obj obj, Fn fn, Args&&... args) { auto outAsync = ::std::make_shared<::IceInternal::LambdaOutgoing>(shared_from_this(), std::move(r), std::move(e), std::move(s)); diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 3cf59d4dac4..3f02c535213 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -7252,7 +7252,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) H << epar << ";" << eb << ";"; } - H << nl << "return _makeLamdaOutgoing<" << futureT << ">" << spar; + H << nl << "return _makeLambdaOutgoing<" << futureT << ">" << spar; H << "std::move(" + (futureOutParams.size() > 1 ? "_responseCb" : responseParam) + ")" << "std::move(" + exParam + ")"