diff options
| author | George Hazan <ghazan@miranda.im> | 2018-01-23 19:51:30 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-01-23 19:51:30 +0300 |
| commit | 80207f75648fad4294a77ff9ce50f0edaedffeca (patch) | |
| tree | 84901161521d83fc1df371f0a7ab1924b61c0b6f /plugins/Dbx_mdbx/src/dbcontacts.cpp | |
| parent | 4a54d1481e37dbac6c055e44abc32e8f72b04a15 (diff) | |
dbx_mdbx:
- fix for a name conflict;
- stricter transaction scope;
- version bump
Diffstat (limited to 'plugins/Dbx_mdbx/src/dbcontacts.cpp')
| -rw-r--r-- | plugins/Dbx_mdbx/src/dbcontacts.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<EventItem> &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;
|