diff options
Diffstat (limited to 'talk/app/webrtc/peerconnectionfactoryproxy.h')
-rw-r--r-- | talk/app/webrtc/peerconnectionfactoryproxy.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/talk/app/webrtc/peerconnectionfactoryproxy.h b/talk/app/webrtc/peerconnectionfactoryproxy.h index 5e924df3a1..714ce6b7eb 100644 --- a/talk/app/webrtc/peerconnectionfactoryproxy.h +++ b/talk/app/webrtc/peerconnectionfactoryproxy.h @@ -29,6 +29,7 @@ #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ #include <string> +#include <utility> #include "talk/app/webrtc/peerconnectioninterface.h" #include "talk/app/webrtc/proxy.h" @@ -38,17 +39,17 @@ namespace webrtc { BEGIN_PROXY_MAP(PeerConnectionFactory) PROXY_METHOD1(void, SetOptions, const Options&) - // Can't use PROXY_METHOD5 because scoped_ptr must be Pass()ed. + // Can't use PROXY_METHOD5 because scoped_ptr must be moved. // TODO(tommi,hbos): Use of templates to support scoped_ptr? rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( const PeerConnectionInterface::RTCConfiguration& a1, const MediaConstraintsInterface* a2, - PortAllocatorFactoryInterface* a3, + rtc::scoped_ptr<cricket::PortAllocator> a3, rtc::scoped_ptr<DtlsIdentityStoreInterface> a4, PeerConnectionObserver* a5) override { return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, this, - a1, a2, a3, a4.release(), a5)); + a1, a2, a3.release(), a4.release(), a5)); } PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, CreateLocalMediaStream, const std::string&) @@ -70,11 +71,13 @@ BEGIN_PROXY_MAP(PeerConnectionFactory) rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( const PeerConnectionInterface::RTCConfiguration& a1, const MediaConstraintsInterface* a2, - PortAllocatorFactoryInterface* a3, + cricket::PortAllocator* a3, DtlsIdentityStoreInterface* a4, PeerConnectionObserver* a5) { + rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3); rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); - return c_->CreatePeerConnection(a1, a2, a3, ptr_a4.Pass(), a5); + return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3), + std::move(ptr_a4), a5); } END_PROXY() |