diff options
| author | Bernard Normier <bernard@zeroc.com> | 2004-04-11 03:44:08 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2004-04-11 03:44:08 +0000 |
| commit | 3aeb8795960a7e504a5a58557fc203b94eec5e3f (patch) | |
| tree | 5ffd38b8c49fc29e8e715cbfef580f39c1827f14 /cpp/include/IceUtil/Cache.h | |
| parent | Fixed VC60 build (diff) | |
| download | ice-3aeb8795960a7e504a5a58557fc203b94eec5e3f.tar.bz2 ice-3aeb8795960a7e504a5a58557fc203b94eec5e3f.tar.xz ice-3aeb8795960a7e504a5a58557fc203b94eec5e3f.zip | |
Fixed GCC warnings
Diffstat (limited to 'cpp/include/IceUtil/Cache.h')
| -rw-r--r-- | cpp/include/IceUtil/Cache.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h index 429c43dad9c..f67abe61533 100644 --- a/cpp/include/IceUtil/Cache.h +++ b/cpp/include/IceUtil/Cache.h @@ -64,7 +64,11 @@ public: if(val != 0) { +#if defined(_MSC_VER) && (_MSC_VER < 1300) std::pair<CacheMap::iterator, bool> ir = +#else + std::pair<typename CacheMap::iterator, bool> ir = +#endif _map.insert(CacheMap::value_type(key, val)); pinned(val, ir.first); } @@ -102,7 +106,11 @@ public: assert(val != 0); Mutex::Lock sync(_mutex); +#if defined(_MSC_VER) && (_MSC_VER < 1300) std::pair<CacheMap::iterator, bool> ir = +#else + std::pair<typename CacheMap::iterator, bool> ir = +#endif _map.insert(CacheMap::value_type(key, val)); if(ir.second) @@ -132,7 +140,11 @@ public: bool pin(const Key& key, const Handle<Value>& val) { Mutex::Lock sync(_mutex); +#if defined(_MSC_VER) && (_MSC_VER < 1300) std::pair<CacheMap::iterator, bool> ir = +#else + std::pair<typename CacheMap::iterator, bool> ir = +#endif _map.insert(CacheMap::value_type(key, val)); if(ir.second) { |