Move m_mergeMap out of header

Author: Linas Beresna

include/IECoreImage/DisplayDriverServer.h

@@ -67,14 +67,6 @@ class IECOREIMAGE_API DisplayDriverServer : public IECore::RunTimeTyped
 		using Port = int;
 #endif
 
-		struct MergeDriverInfo
-		{
-			DisplayDriverPtr mergeDriver = nullptr;
-			int mergeCount = 0;
-		};
-
-		using MergeMap = std::map<int, MergeDriverInfo>;
-
 		using PortRange = std::pair<Port, Port>;
 
 		/// A port number of 0 causes a free port to be chosen
@@ -111,8 +103,6 @@ class IECOREIMAGE_API DisplayDriverServer : public IECore::RunTimeTyped
 		class PrivateData;
 		IE_CORE_DECLAREPTR( PrivateData );
 		PrivateDataPtr m_data;
-
-		MergeMap m_mergeMap;
 };
 
 IE_CORE_DECLAREPTR( DisplayDriverServer )

src/IECoreImage/DisplayDriverServer.cpp

@@ -73,6 +73,14 @@ IE_CORE_DEFINERUNTIMETYPED( DisplayDriverServer );
 namespace
 {
 
+struct MergeDriverInfo
+{
+	DisplayDriverPtr mergeDriver = nullptr;
+	int mergeCount = 0;
+};
+
+using MergeMap = std::map<int, MergeDriverInfo>;
+
 /* Set the FD_CLOEXEC flag for the given socket descriptor, so that it will not exist on child processes.*/
 static void fixSocketFlags( int socketDesc )
 {
@@ -98,7 +106,7 @@ class DisplayDriverServer::Session : public RefCounted
 {
 	public:
 
-		Session( boost::asio::io_service& io_service, DisplayDriverServer::MergeMap& mergeMap );
+		Session( boost::asio::io_service& io_service, MergeMap& mergeMap );
 		~Session() override;
 
 		boost::asio::ip::tcp::socket& socket();
@@ -117,7 +125,7 @@ class DisplayDriverServer::Session : public RefCounted
 		DisplayDriverPtr m_displayDriver;
 		DisplayDriverServerHeader m_header;
 		CharVectorDataPtr m_buffer;
-		DisplayDriverServer::MergeMap& m_mergeMap;
+		MergeMap& m_mergeMap;
 		std::optional<int> m_mergeId;
 };
 
@@ -130,6 +138,7 @@ class DisplayDriverServer::PrivateData : public RefCounted
 		boost::asio::io_service m_service;
 		boost::asio::ip::tcp::acceptor m_acceptor;
 		std::thread m_thread;
+		MergeMap m_mergeMap;
 
 		PrivateData( DisplayDriverServer::Port portNumber ) :
 			m_service(),
@@ -201,7 +210,7 @@ DisplayDriverServer::DisplayDriverServer( DisplayDriverServer::Port portNumber )
 {
 	m_data = new DisplayDriverServer::PrivateData( portNumber );
 
-	DisplayDriverServer::SessionPtr newSession( new DisplayDriverServer::Session( m_data->m_service, m_mergeMap ) );
+	DisplayDriverServer::SessionPtr newSession( new DisplayDriverServer::Session( m_data->m_service, m_data->m_mergeMap ) );
 	m_data->m_acceptor.async_accept( newSession->socket(),
 			boost::bind( &DisplayDriverServer::handleAccept, this, newSession,
 			boost::asio::placeholders::error));
@@ -285,7 +294,7 @@ void DisplayDriverServer::handleAccept( DisplayDriverServer::SessionPtr session,
 {
 	if (!error)
 	{
-		DisplayDriverServer::SessionPtr newSession( new DisplayDriverServer::Session( m_data->m_service, m_mergeMap ) );
+		DisplayDriverServer::SessionPtr newSession( new DisplayDriverServer::Session( m_data->m_service, m_data->m_mergeMap ) );
 		m_data->m_acceptor.async_accept( newSession->socket(),
 				boost::bind( &DisplayDriverServer::handleAccept,  this, newSession,
 				boost::asio::placeholders::error));
@@ -297,7 +306,7 @@ void DisplayDriverServer::handleAccept( DisplayDriverServer::SessionPtr session,
  * DisplayDriverServer::Session functions
  */
 
-DisplayDriverServer::Session::Session( boost::asio::io_service& io_service, DisplayDriverServer::MergeMap& mergeMap ) :
+DisplayDriverServer::Session::Session( boost::asio::io_service& io_service, MergeMap& mergeMap ) :
 	m_socket( io_service ), m_displayDriver(nullptr), m_buffer( new CharVectorData( ) ), m_mergeMap( mergeMap )
 {
 }