diff options
author | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
commit | df1447c665e6c3631961297a9d3e9aff4e94c47f (patch) | |
tree | c0ff117c362e6d571f430f886ab62f372b59af08 /src/socket/Socket.cpp | |
parent | bb335dca695273622b7a4ebbefbe9e089edb9ab4 (diff) | |
download | ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.gz ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.bz2 ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.zip |
Remove Raul::SharedPtr and switch to std::shared_ptr.
Use project local short type aliases for shared_ptr and friends.
Move Raul::Disposable and Raul::Manageable into Raul::Maid.
Use sets to store machina nodes and edges to avoid O(n) searches.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4939 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/socket/Socket.cpp')
-rw-r--r-- | src/socket/Socket.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/socket/Socket.cpp b/src/socket/Socket.cpp index 2de88226..689e7eb6 100644 --- a/src/socket/Socket.cpp +++ b/src/socket/Socket.cpp @@ -21,6 +21,7 @@ #include <stdlib.h> #include <sys/socket.h> #include <sys/un.h> +#include <unistd.h> #include <string> @@ -142,7 +143,7 @@ Socket::listen() } } -SharedPtr<Socket> +SPtr<Socket> Socket::accept() { socklen_t client_addr_len = _addr_len; @@ -151,7 +152,7 @@ Socket::accept() int conn = ::accept(_sock, client_addr, &client_addr_len); if (conn == -1) { - return SharedPtr<Socket>(); + return SPtr<Socket>(); } Raul::URI client_uri = _uri; @@ -161,7 +162,7 @@ Socket::accept() client_uri = Raul::URI(_uri.scheme() + "://" + host); } - return SharedPtr<Socket>( + return SPtr<Socket>( new Socket(_type, client_uri, client_addr, client_addr_len, conn)); } |