generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-02 14:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Problem: Solaris Studio does not convert from char * to string

Browse Source 
Solution: do it explicitly to fix build on Solaris 10/11 with the Sun
compiler
This commit is contained in:
Luca Boccassi
2018-05-13 13:16:37 +01:00
parent 3d9c119543
commit 8b82ed50a2
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ctx.cpp
View File

@@ -503,7 +503,8 @@ int zmq::ctx_t::register_endpoint (const char *addr_,
scoped_lock_t locker (endpoints_sync); scoped_lock_t locker (endpoints_sync);
const bool inserted = const bool inserted =
endpoints.ZMQ_MAP_INSERT_OR_EMPLACE (addr_, endpoint_).second; endpoints.ZMQ_MAP_INSERT_OR_EMPLACE (std::string (addr_), endpoint_)
.second;
if (!inserted) { if (!inserted) {
errno = EADDRINUSE; errno = EADDRINUSE;
return -1; return -1;

3
src/mechanism.cpp
View File

@@ -62,7 +62,8 @@ void zmq::mechanism_t::set_user_id (const void *data_, size_t size_)
{ {
user_id.set (static_cast<const unsigned char *> (data_), size_); user_id.set (static_cast<const unsigned char *> (data_), size_);
zap_properties.ZMQ_MAP_INSERT_OR_EMPLACE ( zap_properties.ZMQ_MAP_INSERT_OR_EMPLACE (
ZMQ_MSG_PROPERTY_USER_ID, std::string ((char *) data_, size_)); std::string (ZMQ_MSG_PROPERTY_USER_ID),
std::string ((char *) data_, size_));
} }
const zmq::blob_t &zmq::mechanism_t::get_user_id () const const zmq::blob_t &zmq::mechanism_t::get_user_id () const

4
src/socket_base.cpp
View File

@@ -783,7 +783,7 @@ int zmq::socket_base_t::connect (const char *addr_)
last_endpoint.assign (addr_); last_endpoint.assign (addr_);
// remember inproc connections for disconnect // remember inproc connections for disconnect
inprocs.ZMQ_MAP_INSERT_OR_EMPLACE (addr_, new_pipes[0]); inprocs.ZMQ_MAP_INSERT_OR_EMPLACE (std::string (addr_), new_pipes[0]);
options.connected = true; options.connected = true;
return 0; return 0;
@@ -982,7 +982,7 @@ void zmq::socket_base_t::add_endpoint (const char *addr_,
{ {
// Activate the session. Make it a child of this socket. // Activate the session. Make it a child of this socket.
launch_child (endpoint_); launch_child (endpoint_);
endpoints.ZMQ_MAP_INSERT_OR_EMPLACE (addr_, endpoints.ZMQ_MAP_INSERT_OR_EMPLACE (std::string (addr_),
endpoint_pipe_t (endpoint_, pipe)); endpoint_pipe_t (endpoint_, pipe));
} }

7
src/stream_engine.cpp
View File

@@ -999,14 +999,15 @@ bool zmq::stream_engine_t::init_properties (properties_t &properties)
{ {
if (peer_address.empty ()) if (peer_address.empty ())
return false; return false;
properties.ZMQ_MAP_INSERT_OR_EMPLACE (ZMQ_MSG_PROPERTY_PEER_ADDRESS, properties.ZMQ_MAP_INSERT_OR_EMPLACE (
peer_address); std::string (ZMQ_MSG_PROPERTY_PEER_ADDRESS), peer_address);
// Private property to support deprecated SRCFD // Private property to support deprecated SRCFD
std::ostringstream stream; std::ostringstream stream;
stream << (int) s; stream << (int) s;
std::string fd_string = stream.str (); std::string fd_string = stream.str ();
properties.ZMQ_MAP_INSERT_OR_EMPLACE ("__fd", ZMQ_MOVE (fd_string)); properties.ZMQ_MAP_INSERT_OR_EMPLACE (std::string ("__fd"),
ZMQ_MOVE (fd_string));
return true; return true;
} }