From cd64a92a8cde573404e8af9e220d4e1c6ce6453e Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Thu, 11 Sep 2014 13:42:21 -0400
Subject: Use const references for Settings methods

Also check for (this == &other) before locking mutexes.
---
 src/util/string.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/util/string.cpp')

diff --git a/src/util/string.cpp b/src/util/string.cpp
index 363a15e65..92a4735c4 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -191,7 +191,7 @@ std::string urldecode(std::string str)
 	return oss.str();
 }
 
-u32 readFlagString(std::string str, FlagDesc *flagdesc, u32 *flagmask)
+u32 readFlagString(std::string str, const FlagDesc *flagdesc, u32 *flagmask)
 {
 	u32 result = 0, mask = 0;
 	char *s = &str[0];
@@ -225,7 +225,7 @@ u32 readFlagString(std::string str, FlagDesc *flagdesc, u32 *flagmask)
 	return result;
 }
 
-std::string writeFlagString(u32 flags, FlagDesc *flagdesc, u32 flagmask)
+std::string writeFlagString(u32 flags, const FlagDesc *flagdesc, u32 flagmask)
 {
 	std::string result;
 
-- 
cgit v1.2.3