Skip to content

Commit 567f2d0

Browse files
committed
FIX: wrong variable name
1 parent b9fb996 commit 567f2d0

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

doc/source/doxygen-docs/changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
\page changelog Change Log
22

3+
# Version 2.14.14: UNRELEASED
4+
- BUG FIXES:
5+
- Fix missing backported fix to build mrpt::lockHelper() on modern gcc
6+
37
# Version 2.14.13: Released Sep 27th, 2025
48
- Changes in libraries:
59
- \ref mrpt_math_grp

libs/core/include/mrpt/core/lock_helper.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class LockHelper
2222
using Tnc = std::remove_const_t<T>;
2323

2424
public:
25-
LockHelper(const Tnc* l) : l_{const_cast<Tnc*>(l)} { l_->lock(); }
25+
LockHelper(const Tnc* l) : l_{const_cast<Tnc*>(l_)} { l_->lock(); }
2626
~LockHelper()
2727
{
2828
if (l_) l_->unlock();
@@ -31,11 +31,11 @@ class LockHelper
3131
LockHelper(const LockHelper& o) = delete;
3232
LockHelper& operator=(const LockHelper& o) = delete;
3333

34-
LockHelper(LockHelper&& o) : l_{o.l} { o.l = nullptr; }
34+
LockHelper(LockHelper&& o) : l_{o.l_} { o.l_ = nullptr; }
3535
LockHelper& operator=(LockHelper&& o)
3636
{
37-
l_ = o.l;
38-
o.l = nullptr;
37+
l_ = o.l_;
38+
o.l_ = nullptr;
3939
return *this;
4040
}
4141

0 commit comments

Comments
 (0)