FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simgear/props/props.cxx: moved common members into SGPropertyLock base class.

Browse Source
This commit is contained in:
Julian Smith 2021-11-16 09:42:52 +00:00
parent 23b3824170
commit 5fe9fd0fc6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
simgear/props/props.cxx
View File

@ -381,6 +381,9 @@ struct SGPropertyLock
if (shared) node._mutex.unlock_shared(); if (shared) node._mutex.unlock_shared();
else node._mutex.unlock(); else node._mutex.unlock();
} }
const SGPropertyNode* m_node = nullptr;
bool m_own = false;
}; };
/* Scoped exclusive lock of a SGPropertyNode. */ /* Scoped exclusive lock of a SGPropertyNode. */
@ -424,9 +427,6 @@ struct SGPropertyLockExclusive : SGPropertyLock
{ {
if (m_own) release(); if (m_own) release();
} }
const SGPropertyNode* m_node = nullptr;
bool m_own = false;
private: private:
SGPropertyLockExclusive(const SGPropertyLockExclusive&); SGPropertyLockExclusive(const SGPropertyLockExclusive&);
@ -437,8 +437,7 @@ struct SGPropertyLockShared : SGPropertyLock
{ {
SGPropertyLockShared() SGPropertyLockShared()
: :
SGPropertyLock(), SGPropertyLock()
m_node(nullptr)
{ {
} }
@ -477,9 +476,6 @@ struct SGPropertyLockShared : SGPropertyLock
{ {
if (m_own) release(); if (m_own) release();
} }
const SGPropertyNode* m_node = nullptr;
bool m_own = false;
private: private:
SGPropertyLockShared(const SGPropertyLockShared&); SGPropertyLockShared(const SGPropertyLockShared&);