Use dcp::file_to_string().

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

diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h
index 1fa0b046f0c1c7e2490865bfaa41a99114f8dcfb..f4520e5cf7c070d3407c2196b1baf8ff98939476 100644 (file)
--- a/src/lib/dcpomatic_socket.h
+++ b/src/lib/dcpomatic_socket.h
@@ -20,9 +20,7 @@
 
 #include "digester.h"
 #include <boost/asio.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
@@ -31,11 +29,14 @@
  *  This class wraps some things that I could not work out how to do easily with boost;
  *  most notably, sync read/write calls with timeouts.
  */
-class Socket : public boost::noncopyable
+class Socket
 {
 public:
        explicit Socket (int timeout = 30);
 
+       Socket (Socket const&) = delete;
+       Socket& operator= (Socket const&) = delete;
+
        /** @return Our underlying socket */
        boost::asio::ip::tcp::socket& socket () {
                return _socket;
@@ -52,10 +53,10 @@ public:
        class ReadDigestScope
        {
        public:
-               ReadDigestScope (boost::shared_ptr<Socket> socket);
+               ReadDigestScope (std::shared_ptr<Socket> socket);
                bool check ();
        private:
-               boost::weak_ptr<Socket> _socket;
+               std::weak_ptr<Socket> _socket;
        };
 
        /** After one of these is created everything that is sent from the socket will be
@@ -65,10 +66,10 @@ public:
        class WriteDigestScope
        {
        public:
-               WriteDigestScope (boost::shared_ptr<Socket> socket);
+               WriteDigestScope (std::shared_ptr<Socket> socket);
                ~WriteDigestScope ();
        private:
-               boost::weak_ptr<Socket> _socket;
+               std::weak_ptr<Socket> _socket;
        };
 
 private:
@@ -80,8 +81,6 @@ private:
        void start_write_digest ();
        void finish_write_digest ();
 
-       Socket (Socket const &);
-
        boost::asio::io_service _io_service;
        boost::asio::deadline_timer _deadline;
        boost::asio::ip::tcp::socket _socket;