1 files changed, 5 insertions, 0 deletions
diff --git a/src/utils/stl_util.h b/src/utils/stl_util.h
index dddb48f12..5a17f46a9 100644
--- a/src/utils/stl_util.h
+++ b/src/utils/stl_util.h
@@ -78,7 +78,12 @@ template<typename K, typename V>
 void multimap_insert(std::multimap<K, V>& multimap,
                      const K& key, const V& value)
    {
+#if defined(BOTAN_BUILD_COMPILER_IS_SUN_STUDIO)
+   // Work around a strange bug in Sun Studio
+   multimap.insert(std::make_pair<const K, V>(key, value));
+#else
    multimap.insert(std::make_pair(key, value));
+#endif
    }
 
 }