diff options
| author | Jose <jose@zeroc.com> | 2012-08-08 18:52:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-08 18:52:08 +0200 |
| commit | 0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545 (patch) | |
| tree | 8067c6695cc5e9672582a904409846e38ffba593 /cpp/src/Freeze/EvictorI.h | |
| parent | Fixed python & ruby compilation error caused by OutputStream::format removal (diff) | |
| download | ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.bz2 ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.xz ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.zip | |
remove VC6 support
Diffstat (limited to 'cpp/src/Freeze/EvictorI.h')
| -rwxr-xr-x | cpp/src/Freeze/EvictorI.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index 5a1ca1f55af..eb42dbb5951 100755 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -218,12 +218,7 @@ protected: facetType = ft->second; } ObjectStore<T>* store = new ObjectStore<T>(facet, facetType,_createDb, this, storeIndices, populateEmptyIndices); - -#if (defined(_MSC_VER) && (_MSC_VER < 1300)) - _storeMap.insert(StoreMap::value_type(facet, store)); -#else _storeMap.insert(typename StoreMap::value_type(facet, store)); -#endif } } @@ -234,11 +229,8 @@ protected: { facet = ""; } -#if (defined(_MSC_VER) && (_MSC_VER < 1300)) - std::pair<StoreMap::iterator, bool> ir = - _storeMap.insert(StoreMap::value_type(facet, 0)); -#elif (defined(_MSC_VER) && (_MSC_VER >= 1600)) - std::pair<typename StoreMap::iterator, bool> ir = +#if (defined(_MSC_VER) && (_MSC_VER >= 1600)) + std::pair<typename StoreMap::iterator, bool> ir = _storeMap.insert(typename StoreMap::value_type(facet, nullptr)); #else std::pair<typename StoreMap::iterator, bool> ir = @@ -279,12 +271,7 @@ protected: facetType = q->second; } os = new ObjectStore<T>(facet, facetType, true, this); - -#if (defined(_MSC_VER) && (_MSC_VER < 1300)) - _storeMap.insert(StoreMap::value_type(facet, os)); -#else _storeMap.insert(typename StoreMap::value_type(facet, os)); -#endif } return os; } |