Fix bug #8105: Crash when deleting math macro from the inside

[lyx.git] / src / ServerSocket.h

diff --git a/src/ServerSocket.h b/src/ServerSocket.h
index 170826345920826beb0db70177ff7eb5e3897b27..2b2ddd11d27e70c93c11937acbf30881beee900f 100644 (file)
--- a/src/ServerSocket.h
+++ b/src/ServerSocket.h
@@ -17,7 +17,8 @@
 #include "support/FileName.h"
 #include "support/socktools.h"
 
-#include <tr1/memory>
+#include "support/shared_ptr.h"
+
 #include <string>
 #include <map>
 
@@ -25,7 +26,6 @@
 namespace lyx {
 
 class LyXDataSocket;
-class LyXFunc;
 
 
 /** Sockets can be in two states: listening and connected.
@@ -40,7 +40,7 @@ class LyXFunc;
 class ServerSocket {
 public:
        ///
-       ServerSocket(LyXFunc *, support::FileName const &);
+       ServerSocket(support::FileName const &);
        ///
        ~ServerSocket();
        /// Address of the local socket
@@ -52,8 +52,6 @@ public:
 private:
        ///
        void writeln(std::string const &);
-       ///
-       LyXFunc * func;
        /// File descriptor for the server socket
        int fd_;
        /// Stores the socket filename
@@ -63,7 +61,7 @@ private:
                MAX_CLIENTS = 10
        };
        /// All connections
-       std::map<int, std::tr1::shared_ptr<LyXDataSocket> > clients;
+       std::map<int, shared_ptr<LyXDataSocket> > clients;
 };