Merge pull request #1429 from jow-/sysstat-musl-compat
[feed/packages.git] / libs / zmq / patches / map_with_const_string_with_ublic++.patch
1 --- a/src/metadata.hpp 2015-06-17 21:39:33.629934688 +0800
2 +++ b/src/metadata.hpp 2014-10-14 22:07:36.000000000 +0800
3 @@ -31,7 +31,7 @@
4 {
5 public:
6
7 - typedef std::map <std::string, const std::string> dict_t;
8 + typedef std::map <std::string, std::string> dict_t;
9
10 metadata_t (const dict_t &dict);
11 virtual ~metadata_t ();
12 --- a/src/socket_base.cpp 2015-06-17 21:42:26.289413233 +0800
13 +++ b/src/socket_base.cpp 2015-06-02 18:31:00.000000000 +0800
14 @@ -20,6 +20,7 @@
15 #include <new>
16 #include <string>
17 #include <algorithm>
18 +#include <ctype.h>
19
20 #include "platform.hpp"
21
22 --- a/src/stream_engine.cpp 2015-06-17 21:57:29.599443517 +0800
23 +++ b/src/stream_engine.cpp 2015-06-02 18:31:00.000000000 +0800
24 @@ -198,7 +198,7 @@
25 // Compile metadata.
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);
32 }
33 @@ -805,7 +805,7 @@
34
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));
39 }
40
41 // Add ZAP properties.