projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pot/merge.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_socket.h
diff --git
a/src/lib/dcpomatic_socket.h
b/src/lib/dcpomatic_socket.h
index 49a27858892153e860ae46e3f3f557909da6a917..f4520e5cf7c070d3407c2196b1baf8ff98939476 100644
(file)
--- a/
src/lib/dcpomatic_socket.h
+++ b/
src/lib/dcpomatic_socket.h
@@
-20,7
+20,6
@@
#include "digester.h"
#include <boost/asio.hpp>
#include "digester.h"
#include <boost/asio.hpp>
-#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
/** @class Socket
#include <boost/scoped_ptr.hpp>
/** @class Socket
@@
-30,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.
*/
* 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);
{
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;
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
return _socket;
@@
-79,8
+81,6
@@
private:
void start_write_digest ();
void finish_write_digest ();
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;
boost::asio::io_service _io_service;
boost::asio::deadline_timer _deadline;
boost::asio::ip::tcp::socket _socket;