summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-07-24 17:50:05 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-07-24 17:50:05 +0200
commit837451eddc4386e19f52db89be7ae38aae471df0 (patch)
tree941671bedc0d1ccdff4bcf3d3087d8a78994229b /src
parent5650743d9edc8b8e85739ab023e8156b451003f1 (diff)
Remove blob_t class
The class was used in a single place. Replaced by a local typedef. Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/blob.hpp34
-rw-r--r--src/connect_session.hpp1
-rw-r--r--src/xpub.hpp3
4 files changed, 2 insertions, 37 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index fb7b010..d18594b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,6 @@ libzmq_la_SOURCES = \
array.hpp \
atomic_counter.hpp \
atomic_ptr.hpp \
- blob.hpp \
clock.hpp \
command.hpp \
config.hpp \
diff --git a/src/blob.hpp b/src/blob.hpp
deleted file mode 100644
index 3c54ac3..0000000
--- a/src/blob.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- 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/>.
-*/
-
-#ifndef __ZMQ_BLOB_HPP_INCLUDED__
-#define __ZMQ_BLOB_HPP_INCLUDED__
-
-#include <string>
-
-namespace zmq
-{
-
- // Object to hold dynamically allocated opaque binary data.
- typedef std::basic_string <unsigned char> blob_t;
-
-}
-
-#endif
diff --git a/src/connect_session.hpp b/src/connect_session.hpp
index bc25d26..cdd78f8 100644
--- a/src/connect_session.hpp
+++ b/src/connect_session.hpp
@@ -23,7 +23,6 @@
#include <string>
-#include "blob.hpp"
#include "session.hpp"
namespace zmq
diff --git a/src/xpub.hpp b/src/xpub.hpp
index 320a1fe..001fa2d 100644
--- a/src/xpub.hpp
+++ b/src/xpub.hpp
@@ -22,11 +22,11 @@
#define __ZMQ_XPUB_HPP_INCLUDED__
#include <deque>
+#include <string>
#include "socket_base.hpp"
#include "mtrie.hpp"
#include "array.hpp"
-#include "blob.hpp"
#include "dist.hpp"
namespace zmq
@@ -71,6 +71,7 @@ namespace zmq
// List of pending (un)subscriptions, ie. those that were already
// applied to the trie, but not yet received by the user.
+ typedef std::basic_string <unsigned char> blob_t;
typedef std::deque <blob_t> pending_t;
pending_t pending;