From 3d9c1195438a7c28827675c687dd70cf3bf26356 Mon Sep 17 00:00:00 2001 From: Simon Giesecke Date: Sun, 13 May 2018 10:51:59 +0200 Subject: [PATCH] Problem: compilation broken on Solaris Solution: remove constness on pair arguments. Fixes #3090 --- src/blob.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/blob.hpp b/src/blob.hpp index e907f1f0..3159bb9d 100644 --- a/src/blob.hpp +++ b/src/blob.hpp @@ -40,7 +40,18 @@ #define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back #define ZMQ_MOVE(x) std::move (x) #else +#if defined ZMQ_HAVE_SOLARIS +template +std::pair make_pair_fix_const (const K &k, const V &v) +{ + return std::pair (k, v); +} + +#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) insert (make_pair_fix_const (k, v)) +#else #define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) insert (std::make_pair (k, v)) +#endif + #define ZMQ_PUSH_OR_EMPLACE_BACK push_back #define ZMQ_MOVE(x) (x) #endif