3 @@ -41,7 +41,7 @@ namespace zmq
7 - typedef std::map <std::string, const std::string> dict_t;
8 + typedef std::map <std::string, std::string> dict_t;
10 metadata_t (const dict_t &dict);
11 virtual ~metadata_t ();
12 --- a/src/socket_base.cpp
13 +++ b/src/socket_base.cpp
20 #include "platform.hpp"
22 --- a/src/stream_engine.cpp
23 +++ b/src/stream_engine.cpp
24 @@ -208,7 +208,7 @@ void zmq::stream_engine_t::plug (io_thre
26 typedef metadata_t::dict_t properties_t;
27 properties_t properties;
28 - properties.insert(std::make_pair("Peer-Address", peer_address));
29 + properties.insert(std::make_pair<std::string, std::string>("Peer-Address", peer_address));
30 zmq_assert (metadata == NULL);
31 metadata = new (std::nothrow) metadata_t (properties);
33 @@ -815,7 +815,7 @@ void zmq::stream_engine_t::mechanism_rea
35 // If we have a peer_address, add it to metadata
36 if (!peer_address.empty()) {
37 - properties.insert(std::make_pair("Peer-Address", peer_address));
38 + properties.insert(std::make_pair<std::string, std::string>("Peer-Address", peer_address));
41 // Add ZAP properties.