diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-05-25 14:50:43 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-05-25 14:50:43 +0000 |
| commit | b3a07881c3cc9b02d4a59ac35dac6cb4bd1b55a4 (patch) | |
| tree | 8e4b75cf47cbf1dbd8dc3dfb24e74879394ef3cf /cpp/src | |
| parent | Renamed existing Freeze Evictor to BackgroundSaveEvictor and added new (diff) | |
| download | ice-b3a07881c3cc9b02d4a59ac35dac6cb4bd1b55a4.tar.bz2 ice-b3a07881c3cc9b02d4a59ac35dac6cb4bd1b55a4.tar.xz ice-b3a07881c3cc9b02d4a59ac35dac6cb4bd1b55a4.zip | |
Fixed VC60 build
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.h | 16 | ||||
| -rw-r--r-- | cpp/src/Freeze/EvictorIteratorI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Freeze/Makefile.mak | 9 | ||||
| -rw-r--r-- | cpp/src/Freeze/TransactionalEvictorI.h | 2 |
4 files changed, 25 insertions, 4 deletions
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index b2f4b5111c5..923f38b7cfc 100644 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -219,7 +219,12 @@ protected: facetType = ft->second; } ObjectStore<T>* store = new ObjectStore<T>(facet, facetType,_createDb, this, storeIndices, populateEmptyIndices); + +#if defined(_MSC_VER) + _storeMap.insert(StoreMap::value_type(facet, store)); +#else _storeMap.insert(typename StoreMap::value_type(facet, store)); +#endif } } @@ -230,9 +235,13 @@ protected: { facet = ""; } - +#if defined(_MSC_VER) + std::pair<StoreMap::iterator, bool> ir = + _storeMap.insert(StoreMap::value_type(facet, 0)); +#else std::pair<typename StoreMap::iterator, bool> ir = _storeMap.insert(typename StoreMap::value_type(facet, 0)); +#endif if(ir.second) { @@ -268,7 +277,12 @@ protected: facetType = q->second; } os = new ObjectStore<T>(facet, facetType, true, this); + +#if defined(_MSC_VER) + _storeMap.insert(StoreMap::value_type(facet, os)); +#else _storeMap.insert(typename StoreMap::value_type(facet, os)); +#endif } return os; } diff --git a/cpp/src/Freeze/EvictorIteratorI.cpp b/cpp/src/Freeze/EvictorIteratorI.cpp index be3fe251c9e..10e459a788c 100644 --- a/cpp/src/Freeze/EvictorIteratorI.cpp +++ b/cpp/src/Freeze/EvictorIteratorI.cpp @@ -164,7 +164,7 @@ Freeze::EvictorIteratorI::nextBatch() toClose->close(); break; // for (;;) } - catch(const DbDeadlockException& dx) + catch(const DbDeadlockException&) { if(dbc != 0) { diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index def8df2f3fa..4b0b90fb1b6 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -16,7 +16,9 @@ DLLNAME = $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX).dll TARGETS = $(LIBNAME) $(DLLNAME) -OBJS = CatalogData.obj \ +OBJS = BackgroundSaveEvictor.obj \ + BackgroundSaveEvictorI.obj \ + CatalogData.obj \ Catalog.obj \ ConnectionI.obj \ Connection.obj \ @@ -33,6 +35,9 @@ OBJS = CatalogData.obj \ PingObject.obj \ SharedDbEnv.obj \ SharedDb.obj \ + TransactionalEvictor.obj \ + TransactionalEvictorI.obj \ + TransactionalEvictorContextI.obj \ TransactionHolder.obj \ TransactionI.obj \ Transaction.obj \ @@ -74,6 +79,7 @@ clean:: clean:: del /q $(DLLNAME:.dll=.*) del /q DB.cpp $(HDIR)\DB.h + del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h del /q CatalogData.cpp $(HDIR)\CatalogData.h del /q Connection.cpp $(HDIR)\Connection.h del /q ConnectionF.cpp $(HDIR)\ConnectionF.h @@ -82,6 +88,7 @@ clean:: del /q Evictor.cpp $(HDIR)\Evictor.h del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h del /q Transaction.cpp $(HDIR)\Transaction.h + del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h del /q PingObject.cpp PingObject.h install:: all diff --git a/cpp/src/Freeze/TransactionalEvictorI.h b/cpp/src/Freeze/TransactionalEvictorI.h index 04f3d9499d8..73c2530d637 100644 --- a/cpp/src/Freeze/TransactionalEvictorI.h +++ b/cpp/src/Freeze/TransactionalEvictorI.h @@ -19,7 +19,7 @@ namespace Freeze class TransactionalEvictorI; -struct TransactionalEvictorElement; +class TransactionalEvictorElement; typedef IceUtil::Handle<TransactionalEvictorElement> TransactionalEvictorElementPtr; class TransactionalEvictorElement : public Ice::LocalObject |