From c8e2e4951c4e98b457c49c9083196a2fe31e4e43 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 12 Jan 2018 14:39:55 +0300
Subject: this solution is too smart, smth goes wrong with it => KISS principle
 rulez

---
 plugins/Dbx_mdbx/src/stdafx.h | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h
index 2e50a70e8b..5a14b7ab6f 100644
--- a/plugins/Dbx_mdbx/src/stdafx.h
+++ b/plugins/Dbx_mdbx/src/stdafx.h
@@ -91,18 +91,15 @@ public:
 		/* FIXME: throw an exception */
 		assert(rc == MDBX_SUCCESS);
 		UNREFERENCED_PARAMETER(rc);
-		m_txn = NULL;
+		m_txn = nullptr;
 	}
 };
 
 struct CMDBX_txn_ro
 {
-	MDBX_txn *m_txn;
-	bool bIsActive;
+	MDBX_txn *m_txn = nullptr;
 	mir_cs cs;
 
-	__forceinline CMDBX_txn_ro() : m_txn(nullptr), bIsActive(false) {}
-
 	__forceinline operator MDBX_txn* () { return m_txn; }
 	__forceinline MDBX_txn** operator &() { return &m_txn; }
 };
@@ -110,28 +107,22 @@ struct CMDBX_txn_ro
 class txn_ptr_ro
 {
 	CMDBX_txn_ro &m_txn;
-	bool bNeedReset;
 	mir_cslock lock;
+
 public:
-	__forceinline txn_ptr_ro(CMDBX_txn_ro &txn) : m_txn(txn), bNeedReset(!txn.bIsActive), lock(m_txn.cs)
+	__forceinline txn_ptr_ro(CMDBX_txn_ro &txn) : m_txn(txn), lock(m_txn.cs)
 	{
-		if (bNeedReset) {
-			int rc = mdbx_txn_renew(m_txn);
-			/* FIXME: throw an exception */
-			assert(rc == MDBX_SUCCESS);
-			(void)rc;
-			m_txn.bIsActive = true;
-		}
+		int rc = mdbx_txn_renew(m_txn);
+		/* FIXME: throw an exception */
+		assert(rc == MDBX_SUCCESS);
+		UNREFERENCED_PARAMETER(rc);
 	}
 	__forceinline ~txn_ptr_ro()
 	{
-		if (bNeedReset) {
-			int rc = mdbx_txn_reset(m_txn);
-			/* FIXME: throw an exception */
-			assert(rc == MDBX_SUCCESS);
-			(void)rc;
-			m_txn.bIsActive = false;
-		}
+		int rc = mdbx_txn_reset(m_txn);
+		/* FIXME: throw an exception */
+		assert(rc == MDBX_SUCCESS);
+		UNREFERENCED_PARAMETER(rc);
 	}
 	__forceinline operator MDBX_txn*() const { return m_txn; }
 };
@@ -144,7 +135,7 @@ public:
 	__forceinline cursor_ptr(MDBX_txn *_txn, MDBX_dbi _dbi)
 	{
 		if (mdbx_cursor_open(_txn, _dbi, &m_cursor) != MDBX_SUCCESS)
-			m_cursor = NULL;
+			m_cursor = nullptr;
 	}
 
 	__forceinline ~cursor_ptr()
-- 
cgit v1.2.3