From 21fba6577aa31b686e1d5243c266f0ca218c38e0 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Thu, 4 Jun 2020 19:56:36 +0300 Subject: [PATCH] mdbx-test: fix clang/glibcxx incompatibility. Change-Id: I59c4f486431126396dc59a84914d78e0eeff1f4c --- test/nested.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/nested.cc b/test/nested.cc index d3dfcd9d..85df6fa6 100644 --- a/test/nested.cc +++ b/test/nested.cc @@ -82,11 +82,7 @@ void testcase_nested::push_txn() { int err = mdbx_txn_begin(db_guard.get(), txn_guard.get(), flags, &txn); if (unlikely(err != MDBX_SUCCESS)) failure_perror("mdbx_txn_begin(nested)", err); -#if __cplusplus >= 201703L - stack.emplace(txn, serial, fifo, speculum); -#else - stack.push(std::make_tuple(scoped_txn_guard(txn), serial, fifo, speculum)); -#endif + stack.emplace(scoped_txn_guard(txn), serial, fifo, speculum); std::swap(txn_guard, std::get<0>(stack.top())); log_verbose("begin level#%zu txn #%" PRIu64 ", flags 0x%x, serial %" PRIu64, stack.size(), mdbx_txn_id(txn), flags, serial);