You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

41 lines
1.5 KiB

  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. - typedef std::map <std::string, const std::string> dict_t;
  7. + typedef std::map <std::string, std::string> dict_t;
  8. metadata_t (const dict_t &dict);
  9. virtual ~metadata_t ();
  10. --- a/src/socket_base.cpp 2015-06-17 21:42:26.289413233 +0800
  11. +++ b/src/socket_base.cpp 2015-06-02 18:31:00.000000000 +0800
  12. @@ -20,6 +20,7 @@
  13. #include <new>
  14. #include <string>
  15. #include <algorithm>
  16. +#include <ctype.h>
  17. #include "platform.hpp"
  18. --- a/src/stream_engine.cpp 2015-06-17 21:57:29.599443517 +0800
  19. +++ b/src/stream_engine.cpp 2015-06-02 18:31:00.000000000 +0800
  20. @@ -198,7 +198,7 @@
  21. // Compile metadata.
  22. typedef metadata_t::dict_t properties_t;
  23. properties_t properties;
  24. - properties.insert(std::make_pair("Peer-Address", peer_address));
  25. + properties.insert(std::make_pair<std::string, std::string>("Peer-Address", peer_address));
  26. zmq_assert (metadata == NULL);
  27. metadata = new (std::nothrow) metadata_t (properties);
  28. }
  29. @@ -805,7 +805,7 @@
  30. // If we have a peer_address, add it to metadata
  31. if (!peer_address.empty()) {
  32. - properties.insert(std::make_pair("Peer-Address", peer_address));
  33. + properties.insert(std::make_pair<std::string, std::string>("Peer-Address", peer_address));
  34. }
  35. // Add ZAP properties.