summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-07-26 20:13:54 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-07-26 20:13:54 +0200
commit258e7e6794928544ca7e1557840b2f5a89fe5399 (patch)
tree4dfedd59f0835767345e7aa5b4d6f3f738ee4f1f
parent279302c5f54ddf8a23b1eaacee63c3158850d9ff (diff)
Code cleanup
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--.gitignore2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/tcp_connecter.cpp46
3 files changed, 2 insertions, 48 deletions
diff --git a/.gitignore b/.gitignore
index 478b73f..6dc8889 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,8 @@ tests/test_shutdown_stress
tests/test_hwm
tests/test_timeo
tests/test_reqrep_device
+tests/test_reqrep_drop
+tests/test_sub_forward
src/platform.hpp*
src/stamp-h1
perf/local_lat
diff --git a/src/Makefile.am b/src/Makefile.am
index 1da5be9..73ba62e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,6 @@ libzmq_la_SOURCES = \
tcp_listener.hpp \
thread.hpp \
trie.hpp \
- vtcp_connecter.hpp \
vtcp_listener.hpp \
windows.hpp \
wire.hpp \
@@ -119,7 +118,6 @@ libzmq_la_SOURCES = \
tcp_listener.cpp \
thread.cpp \
trie.cpp \
- vtcp_connecter.cpp \
vtcp_listener.cpp \
xpub.cpp \
xrep.cpp \
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
index b530e8e..678d488 100644
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -23,52 +23,6 @@
#include "tcp_connecter.hpp"
#include "tcp_engine.hpp"
-#include "platform.hpp"
-#include "ip.hpp"
-#include "err.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-#endif
-
-
-/*
- Copyright (c) 2007-2011 iMatix Corporation
- Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-
- This file is part of 0MQ.
-
- 0MQ is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- 0MQ 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <new>
-#include <string>
-
-#include "tcp_connecter.hpp"
-#include "tcp_engine.hpp"
#include "io_thread.hpp"
#include "platform.hpp"
#include "ip.hpp"