summaryrefslogtreecommitdiff
path: root/cpp/include/IceUtil/Cache.h
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-08-08 18:52:08 +0200
committerJose <jose@zeroc.com>2012-08-08 18:52:08 +0200
commit0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545 (patch)
tree8067c6695cc5e9672582a904409846e38ffba593 /cpp/include/IceUtil/Cache.h
parentFixed python & ruby compilation error caused by OutputStream::format removal (diff)
downloadice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.bz2
ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.xz
ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.zip
remove VC6 support
Diffstat (limited to 'cpp/include/IceUtil/Cache.h')
-rw-r--r--cpp/include/IceUtil/Cache.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h
index 31d6e7cc460..4c698585072 100644
--- a/cpp/include/IceUtil/Cache.h
+++ b/cpp/include/IceUtil/Cache.h
@@ -168,12 +168,7 @@ template<typename Key, typename Value> bool
Cache<Key, Value>::pin(const Key& key, const Handle<Value>& obj)
{
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
-
#ifdef _MSC_VER
_map.insert(CacheMap::value_type(key, CacheValue(obj)));
#else
@@ -222,12 +217,7 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj)
latch = 0;
}
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- std::pair<CacheMap::iterator, bool> ir =
-#else
std::pair<typename CacheMap::iterator, bool> ir =
-#endif
-
#if defined(_MSC_VER)
_map.insert(CacheMap::value_type(key, CacheValue(0)));
#else