From db09fab47be8e4b55755479bf19dfda25239ba42 Mon Sep 17 00:00:00 2001
From: Simon Giesecke <simon.giesecke@btc-ag.com>
Date: Mon, 5 Nov 2018 16:55:39 +0100
Subject: [PATCH] Problem: compilation broken with Sun Studio

Solution: do not use make_pair
---
 src/session_base.cpp | 29 ++++++++++++++++-------------
 src/session_base.hpp |  4 ++--
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/session_base.cpp b/src/session_base.cpp
index 35580c8c..ef7daf95 100644
--- a/src/session_base.cpp
+++ b/src/session_base.cpp
@@ -552,20 +552,20 @@ void zmq::session_base_t::reconnect ()
 
 zmq::session_base_t::connecter_factory_entry_t
   zmq::session_base_t::_connecter_factories[] = {
-    std::make_pair (protocol_name::tcp,
-                    &zmq::session_base_t::create_connecter_tcp),
+    connecter_factory_entry_t (protocol_name::tcp,
+                               &zmq::session_base_t::create_connecter_tcp),
 #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS                     \
   && !defined ZMQ_HAVE_VXWORKS
-    std::make_pair (protocol_name::ipc,
-                    &zmq::session_base_t::create_connecter_ipc),
+    connecter_factory_entry_t (protocol_name::ipc,
+                               &zmq::session_base_t::create_connecter_ipc),
 #endif
 #if defined ZMQ_HAVE_TIPC
-    std::make_pair (protocol_name::tipc,
-                    &zmq::session_base_t::create_connecter_tipc),
+    connecter_factory_entry_t (protocol_name::tipc,
+                               &zmq::session_base_t::create_connecter_tipc),
 #endif
 #if defined ZMQ_HAVE_VMCI
-    std::make_pair (protocol_name::vmci,
-                    &zmq::session_base_t::create_connecter_vmci),
+    connecter_factory_entry_t (protocol_name::vmci,
+                               &zmq::session_base_t::create_connecter_vmci),
 #endif
 };
 
@@ -577,14 +577,17 @@ zmq::session_base_t::connecter_factory_map_t
 
 zmq::session_base_t::start_connecting_entry_t
   zmq::session_base_t::_start_connecting_entries[] = {
-    std::make_pair (protocol_name::udp,
-                    &zmq::session_base_t::start_connecting_udp),
+    start_connecting_entry_t (protocol_name::udp,
+                              &zmq::session_base_t::start_connecting_udp),
 #if defined ZMQ_HAVE_OPENPGM
-    std::make_pair ("pgm", &zmq::session_base_t::start_connecting_pgm),
-    std::make_pair ("epgm", &zmq::session_base_t::start_connecting_pgm),
+    start_connecting_entry_t ("pgm",
+                              &zmq::session_base_t::start_connecting_pgm),
+    start_connecting_entry_t ("epgm",
+                              &zmq::session_base_t::start_connecting_pgm),
 #endif
 #if defined ZMQ_HAVE_NORM
-    std::make_pair ("norm", &zmq::session_base_t::start_connecting_norm),
+    start_connecting_entry_t ("norm",
+                              &zmq::session_base_t::start_connecting_norm),
 #endif
 };
 
diff --git a/src/session_base.hpp b/src/session_base.hpp
index 20292a85..002cdf87 100644
--- a/src/session_base.hpp
+++ b/src/session_base.hpp
@@ -107,7 +107,7 @@ class session_base_t : public own_t, public io_object_t, public i_pipe_events
 
     typedef own_t *(session_base_t::*connecter_factory_fun_t) (
       io_thread_t *io_thread, bool wait_);
-    typedef std::pair<std::string, connecter_factory_fun_t>
+    typedef std::pair<const std::string, connecter_factory_fun_t>
       connecter_factory_entry_t;
     static connecter_factory_entry_t _connecter_factories[];
     typedef std::map<std::string, connecter_factory_fun_t>
@@ -121,7 +121,7 @@ class session_base_t : public own_t, public io_object_t, public i_pipe_events
 
     typedef void (session_base_t::*start_connecting_fun_t) (
       io_thread_t *io_thread);
-    typedef std::pair<std::string, start_connecting_fun_t>
+    typedef std::pair<const std::string, start_connecting_fun_t>
       start_connecting_entry_t;
     static start_connecting_entry_t _start_connecting_entries[];
     typedef std::map<std::string, start_connecting_fun_t>