X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=serverpool.cpp;h=232ccea72a1acdc01fef8104c8f7048e7cb28a8c;hb=a0fe013448d188b324c00383cfd91695d9d3d076;hp=85561278e6222995f7f863ed48e6a03424597686;hpb=3b73724f08274a2c5a435d6a834bc10fcf3db41b;p=cubemap

diff --git a/serverpool.cpp b/serverpool.cpp
index 8556127..232ccea 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;
@@ -69,7 +60,7 @@ void ServerPool::add_client_from_serialized(const ClientProto &client)
 
 int ServerPool::lookup_stream_by_url(const string &url) const
 {
-	assert(servers != NULL);
+	assert(servers != nullptr);
 	return servers[0].lookup_stream_by_url(url);
 }
 
@@ -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;
 }