X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=serverpool.cpp;fp=serverpool.cpp;h=1414d219909407c1ca2574ca581cc46179a5483d;hp=85561278e6222995f7f863ed48e6a03424597686;hb=26fe3ab755034ea3be8321ec0af548670f8c3bd8;hpb=a0629a862bbac969ff858d8b4c3e78bd299aa721 diff --git a/serverpool.cpp b/serverpool.cpp index 8556127..1414d21 100644 --- a/serverpool.cpp +++ b/serverpool.cpp @@ -22,15 +22,6 @@ ServerPool::ServerPool(int size) { } -ServerPool::~ServerPool() -{ - delete[] servers; - - for (UDPStream *udp_stream : udp_streams) { - delete udp_stream; - } -} - CubemapStateProto ServerPool::serialize() { CubemapStateProto state; @@ -123,7 +114,7 @@ int ServerPool::add_stream_from_serialized(const StreamProto &stream, const vect int ServerPool::add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl, int multicast_iface_index) { - udp_streams.push_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index)); + udp_streams.emplace_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index)); return num_http_streams + udp_streams.size() - 1; }