2 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index ba67dac2538..f5b3720e77e 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -70,7 +70,7 @@ remove(multimap<K, V>& m, K k, V v)
 }
 
 template <typename K, typename V> ::IceInternal::Handle<V>
-find(multimap<K,::IceInternal::Handle<V> >& m, 
+find(const multimap<K,::IceInternal::Handle<V> >& m, 
      K k, 
      const ::IceUtilInternal::ConstMemFun<bool, V, ::IceInternal::Handle<V> >& predicate)
 {
diff --git a/cpp/src/IceDB/FreezeTypes.h b/cpp/src/IceDB/FreezeTypes.h
index 5df0e50d2b6..c129ab8a63e 100644
--- a/cpp/src/IceDB/FreezeTypes.h
+++ b/cpp/src/IceDB/FreezeTypes.h
@@ -113,7 +113,12 @@ public:
             for(typename Dict::const_iterator p = _dict.begin(); p != _dict.end(); ++p)
 #endif
             {
-                m.insert(*p);
+#ifdef __SUNPRO_CC             
+                std::map<Key, Value>::value_type v(p->first, p->second);
+                m.insert(v);
+#else
+		m.insert(*p);
+#endif
             }
             return m;
         }