aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-09-03 14:54:00 +0000
committerlloyd <[email protected]>2010-09-03 14:54:00 +0000
commit6cf76b6bdc022887098301e71df7eebeef1d280b (patch)
treec5934d6b3b6c794062a8e0d02cba7da348bab37b /src/utils
parent36575f0da3cb879816b1dc7e696a67a7c9c03c72 (diff)
Work around Sun Studio multimap insert bug
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/stl_util.h5
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
}
}