diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /cpp/include/IceUtil/Cache.h | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'cpp/include/IceUtil/Cache.h')
| -rw-r--r-- | cpp/include/IceUtil/Cache.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h index e11830ead39..31d6e7cc460 100644 --- a/cpp/include/IceUtil/Cache.h +++ b/cpp/include/IceUtil/Cache.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_CACHE_H -#define ICE_UTIL_CACHE_H +#pragma once #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -175,7 +174,7 @@ Cache<Key, Value>::pin(const Key& key, const Handle<Value>& obj) std::pair<typename CacheMap::iterator, bool> ir = #endif -#if defined(_MSC_VER) +#ifdef _MSC_VER _map.insert(CacheMap::value_type(key, CacheValue(obj))); #else _map.insert(typename CacheMap::value_type(key, CacheValue(obj))); @@ -229,7 +228,7 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj) std::pair<typename CacheMap::iterator, bool> ir = #endif -#if defined(_MSC_VER) || defined(__BCPLUSPLUS__) +#if defined(_MSC_VER) _map.insert(CacheMap::value_type(key, CacheValue(0))); #else _map.insert(typename CacheMap::value_type(key, CacheValue(0))); @@ -368,5 +367,3 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj) } } - -#endif |