diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-05-25 15:13:55 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-05-25 15:13:55 +0000 |
| commit | 9710bd8903e234650ea6143c4ea08c844032675b (patch) | |
| tree | c2b2f401ed21170f30ead6a9f1b580a31d339197 /cpp/src | |
| parent | Fixed VC60 build (diff) | |
| download | ice-9710bd8903e234650ea6143c4ea08c844032675b.tar.bz2 ice-9710bd8903e234650ea6143c4ea08c844032675b.tar.xz ice-9710bd8903e234650ea6143c4ea08c844032675b.zip | |
VC80 fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index 923f38b7cfc..c27b51af34d 100644 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -220,7 +220,7 @@ protected: } ObjectStore<T>* store = new ObjectStore<T>(facet, facetType,_createDb, this, storeIndices, populateEmptyIndices); -#if defined(_MSC_VER) +#if defined(_MSC_VER) && (_MSC_VER < 1300) _storeMap.insert(StoreMap::value_type(facet, store)); #else _storeMap.insert(typename StoreMap::value_type(facet, store)); @@ -235,7 +235,7 @@ protected: { facet = ""; } -#if defined(_MSC_VER) +#if defined(_MSC_VER) && (_MSC_VER < 1300) std::pair<StoreMap::iterator, bool> ir = _storeMap.insert(StoreMap::value_type(facet, 0)); #else @@ -278,7 +278,7 @@ protected: } os = new ObjectStore<T>(facet, facetType, true, this); -#if defined(_MSC_VER) +#if defined(_MSC_VER) && (_MSC_VER < 1300) _storeMap.insert(StoreMap::value_type(facet, os)); #else _storeMap.insert(typename StoreMap::value_type(facet, os)); |