diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-18 14:33:16 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-18 14:33:16 +0200 |
| commit | 2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc (patch) | |
| tree | 0a381f9b284eb7ca5acc9bca5a97659d19874f9d /cpp/src/Freeze/EvictorIteratorI.cpp | |
| parent | ICE-4828 - Buffer.h undeclared ptrdiff_t issue on OpenSUSE (diff) | |
| download | ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.bz2 ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.xz ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.zip | |
Added support for encoding versioning
Diffstat (limited to 'cpp/src/Freeze/EvictorIteratorI.cpp')
| -rw-r--r-- | cpp/src/Freeze/EvictorIteratorI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Freeze/EvictorIteratorI.cpp b/cpp/src/Freeze/EvictorIteratorI.cpp index 66681bb6dec..b2c95977d91 100644 --- a/cpp/src/Freeze/EvictorIteratorI.cpp +++ b/cpp/src/Freeze/EvictorIteratorI.cpp @@ -72,7 +72,8 @@ Freeze::EvictorIteratorI::nextBatch() Key firstKey = _key; - CommunicatorPtr communicator = _store->communicator(); + const CommunicatorPtr& communicator = _store->communicator(); + const EncodingVersion& encoding = _store->encoding(); DbTxn* txn = _tx == 0 ? 0: _tx->dbTxn(); @@ -134,7 +135,7 @@ Freeze::EvictorIteratorI::nextBatch() flags = DB_NEXT; Ice::Identity ident; - ObjectStoreBase::unmarshal(ident, _key, communicator); + ObjectStoreBase::unmarshal(ident, _key, communicator, encoding); if(_batch.size() < _batchSize) { _batch.push_back(ident); |