From 80207f75648fad4294a77ff9ce50f0edaedffeca Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 23 Jan 2018 19:51:30 +0300 Subject: dbx_mdbx: - fix for a name conflict; - stricter transaction scope; - version bump --- plugins/Dbx_mdbx/src/dbcontacts.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/Dbx_mdbx/src/dbcontacts.cpp') diff --git a/plugins/Dbx_mdbx/src/dbcontacts.cpp b/plugins/Dbx_mdbx/src/dbcontacts.cpp index 39d5c2ed27..b0eb5ca2ee 100644 --- a/plugins/Dbx_mdbx/src/dbcontacts.cpp +++ b/plugins/Dbx_mdbx/src/dbcontacts.cpp @@ -113,7 +113,7 @@ void CDbxMDBX::GatherContactHistory(MCONTACT hContact, LIST &list) DBEventSortingKey keyVal = { hContact, 0, 0 }; MDBX_val key = { &keyVal, sizeof(keyVal) }, data; - txn_ptr_ro trnlck(m_txn); + txn_ptr_ro trnlck(m_txn_ro); cursor_ptr_ro cursor(m_curEventsSort); for (int res = mdbx_cursor_get(cursor, &key, &data, MDBX_SET_RANGE); res == MDBX_SUCCESS; res = mdbx_cursor_get(cursor, &key, &data, MDBX_NEXT)) { @@ -218,7 +218,7 @@ void DBCachedContact::Revert() void CDbxMDBX::FillContacts() { { - txn_ptr_ro trnlck(m_txn); + txn_ptr_ro trnlck(m_txn_ro); cursor_ptr_ro cursor(m_curContacts); MDBX_val key, data; -- cgit v1.2.3