diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-12-17 18:19:39 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-17 18:19:39 +0100 |
| commit | 6795b36b5447bfaaf1d45a2a8419451557ef450e (patch) | |
| tree | 153b32db8c3feb62c5fa92290a059724d26bca0d /cpp/src | |
| parent | trivial edits for map_filesystem demo (diff) | |
| download | ice-6795b36b5447bfaaf1d45a2a8419451557ef450e.tar.bz2 ice-6795b36b5447bfaaf1d45a2a8419451557ef450e.tar.xz ice-6795b36b5447bfaaf1d45a2a8419451557ef450e.zip | |
CC 5.10 support (from Bernard's patch)
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceDB/FreezeTypes.h | 7 |
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; } |