Problem: compilation broken with Sun Studio

Solution: do not use make_pair
This commit is contained in:
Simon Giesecke
2018-11-05 16:55:39 +01:00
parent c590873ff7
commit db09fab47b
2 changed files with 18 additions and 15 deletions

View File

@@ -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>