diff options
author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-03-26 14:00:57 +0100 |
---|---|---|
committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-03-26 14:00:57 +0100 |
commit | 880c9768a9323800ca8d44cc4b73e92278e58743 (patch) | |
tree | cf5b0b340e7a02bff8e13ae364901b324114228b /src/settings.h | |
parent | 83d09ffaf688aac9f2de67d06420572e4d0664dc (diff) | |
parent | 437d01196899f85bbc77d71123018aa26be337da (diff) | |
download | dragonfireclient-880c9768a9323800ca8d44cc4b73e92278e58743.tar.xz |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'src/settings.h')
-rw-r--r-- | src/settings.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings.h b/src/settings.h index b5e859ee0..e22d949d3 100644 --- a/src/settings.h +++ b/src/settings.h @@ -239,6 +239,8 @@ private: // Allow TestSettings to run sanity checks using private functions. friend class TestSettings; + // For sane mutex locking when iterating + friend class LuaSettings; void updateNoLock(const Settings &other); void clearNoLock(); |