diff options
| author | ZeroC Staff <git@zeroc.com> | 2007-12-12 20:59:12 -0500 |
|---|---|---|
| committer | ZeroC Staff <git@zeroc.com> | 2007-12-12 20:59:12 -0500 |
| commit | 79fa894c4b0e40104b37708d4f44a3c8ddf18a01 (patch) | |
| tree | 75ed8eab6c4671abb85cdc2443770babb769db7d /cpp/src | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-79fa894c4b0e40104b37708d4f44a3c8ddf18a01.tar.bz2 ice-79fa894c4b0e40104b37708d4f44a3c8ddf18a01.tar.xz ice-79fa894c4b0e40104b37708d4f44a3c8ddf18a01.zip | |
Fixed VC build
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/Freeze/MapI.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index d140f82c227..4583fad40eb 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -31,11 +31,11 @@ OBJS = BackgroundSaveEvictor.obj \ Exception.obj \ IndexI.obj \ Index.obj \ + MapDb.obj \ MapI.obj \ ObjectStore.obj \ PingObject.obj \ SharedDbEnv.obj \ - SharedDb.obj \ TransactionalEvictor.obj \ TransactionalEvictorI.obj \ TransactionalEvictorContext.obj \ diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp index 11bf07028cf..55fd6c73d43 100644 --- a/cpp/src/Freeze/MapI.cpp +++ b/cpp/src/Freeze/MapI.cpp @@ -1454,7 +1454,7 @@ Freeze::MapHelperI::destroy() break; // for(;;) } - catch(const DbDeadlockException& dx) + catch(const DbDeadlockException&) { if(_connection->deadlockWarning()) { |