← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to src/client/rpc/make_socket_rpc_channel.cpp

  • Committer: Package Import Robot
  • Author(s): CI Train Bot
  • Date: 2015-05-12 13:12:55 UTC
  • mto: This revision was merged to the branch mainline in revision 96.
  • Revision ID: package-import@ubuntu.com-20150512131255-y7z12i8n4pbvo70x
Tags: upstream-0.13.0+15.10.20150512
Import upstream version 0.13.0+15.10.20150512

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/rpc/make_socket_rpc_channel.cpp
52
52
    if (fd_prefix.is_start_of(name))
53
53
    {
54
54
        auto const fd = atoi(name.c_str()+fd_prefix.size);
55
 
        transport = std::unique_ptr<mclr::StreamTransport>{new mclr::StreamSocketTransport{mir::Fd{fd}}};
 
55
        transport = std::make_unique<mclr::StreamSocketTransport>(mir::Fd{fd});
56
56
    }
57
57
    else
58
58
    {
59
 
        transport = std::unique_ptr<mclr::StreamTransport>{new mclr::StreamSocketTransport{name}};
 
59
        transport = std::make_unique<mclr::StreamSocketTransport>(name);
60
60
    }
61
61
    return std::make_shared<MirProtobufRpcChannel>(std::move(transport), map, disp_conf, rpc_report, lifecycle_control, event_sink);
62
62
}