Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / dcpomatic_socket.h

diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h
index b9859f600e40c16a76bbaa431a8ad4f57d655926..fa5250a1ad184225f6994f0c6767dd072c28e9c5 100644 (file)
--- a/src/lib/dcpomatic_socket.h
+++ b/src/lib/dcpomatic_socket.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -30,7 +31,6 @@ class Socket : public boost::noncopyable
 {
 public:
        Socket (int timeout = 30);
-       ~Socket ();
 
        /** @return Our underlying socket */
        boost::asio::ip::tcp::socket& socket () {
@@ -38,14 +38,13 @@ public:
        }
 
        void connect (boost::asio::ip::tcp::endpoint);
-       void accept (int);
 
        void write (uint32_t n);
        void write (uint8_t const * data, int size);
-       
+
        void read (uint8_t* data, int size);
        uint32_t read_uint32 ();
-       
+
 private:
        void check ();
 
@@ -54,6 +53,5 @@ private:
        boost::asio::io_service _io_service;
        boost::asio::deadline_timer _deadline;
        boost::asio::ip::tcp::socket _socket;
-       boost::asio::ip::tcp::acceptor* _acceptor;
        int _timeout;
 };