2 files changed, 23 insertions, 4 deletions

diff --git a/src/OSSupport/Network.cpp b/src/OSSupport/Network.cpp
index d947bfa90..0e19e40de 100644
--- a/src/OSSupport/Network.cpp
+++ b/src/OSSupport/Network.cpp
@@ -358,8 +358,8 @@ protected:
 	/** Converts LibEvent-generated log events into log messages in MCS log. */
 	static void LogCallback(int a_Severity, const char * a_Msg);
 
-	/** Runs the thread that LibEvent uses to dispatch event. */
-	static void EventLoopThread(cNetworkSingleton * a_Self);
+	/** Implements the thread that runs LibEvent's event dispatcher loop. */
+	static void RunEventLoop(cNetworkSingleton * a_Self);
 };
 
 
@@ -722,7 +722,8 @@ cNetworkSingleton::cNetworkSingleton(void)
 	}
 
 	// Create the event loop thread:
-	std::thread::thread(EventLoopThread, this).detach();
+	std::thread EventLoopThread(RunEventLoop, this);
+	EventLoopThread.detach();
 }
 
 
@@ -827,7 +828,7 @@ void cNetworkSingleton::LogCallback(int a_Severity, const char * a_Msg)
 
 
 
-void cNetworkSingleton::EventLoopThread(cNetworkSingleton * a_Self)
+void cNetworkSingleton::RunEventLoop(cNetworkSingleton * a_Self)
 {
 	event_base_loop(a_Self->m_EventBase, EVLOOP_NO_EXIT_ON_EMPTY);
 }
diff --git a/src/OSSupport/Network.h b/src/OSSupport/Network.h
index 447cd457b..5cca511dc 100644
--- a/src/OSSupport/Network.h
+++ b/src/OSSupport/Network.h
@@ -22,6 +22,9 @@ public:
 	class cCallbacks
 	{
 	public:
+		// Force a virtual destructor for all descendants:
+		virtual ~cCallbacks() {}
+
 		/** Called when there's data incoming from the remote peer. */
 		virtual void OnReceivedData(cTCPLink & a_Link, const char * a_Data, size_t a_Length) = 0;
 
@@ -36,6 +39,9 @@ public:
 	typedef SharedPtr<cCallbacks> cCallbacksPtr;
 
 
+	// Force a virtual destructor for all descendants:
+	virtual ~cTCPLink() {}
+
 	/** Queues the specified data for sending to the remote peer.
 	Returns true on success, false on failure. Note that this success or failure only reports the queue status, not the actual data delivery. */
 	virtual bool Send(const void * a_Data, size_t a_Length) = 0;
@@ -86,6 +92,9 @@ class cServerHandle
 	friend class cNetwork;
 public:
 
+	// Force a virtual destructor for all descendants:
+	virtual ~cServerHandle() {}
+
 	/** Stops the server, no more incoming connections will be accepted. */
 	virtual void Close(void) = 0;
 
@@ -105,6 +114,9 @@ public:
 	class cConnectCallbacks
 	{
 	public:
+		// Force a virtual destructor for all descendants:
+		virtual ~cConnectCallbacks() {}
+
 		/** Called when the Connect call succeeds.
 		Provides the newly created link that can be used for communication. */
 		virtual void OnSuccess(cTCPLink & a_Link) = 0;
@@ -119,6 +131,9 @@ public:
 	class cListenCallbacks
 	{
 	public:
+		// Force a virtual destructor for all descendants:
+		virtual ~cListenCallbacks() {}
+
 		/** Called when the TCP server created with Listen() accepts an incoming connection.
 		Provides the newly created Link that can be used for communication. */
 		virtual void OnAccepted(cTCPLink & a_Link) = 0;
@@ -130,6 +145,9 @@ public:
 	class cResolveNameCallbacks
 	{
 	public:
+		// Force a virtual destructor for all descendants:
+		virtual ~cResolveNameCallbacks() {}
+
 		/** Called when the hostname is successfully resolved into an IP address. */
 		virtual void OnNameResolved(const AString & a_Name, const AString & a_IP) = 0;