aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/string.h2
-rw-r--r--src/util/thread.h14
2 files changed, 5 insertions, 11 deletions
diff --git a/src/util/string.h b/src/util/string.h
index 1a0b9f60d..632dd4d7e 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -232,7 +232,7 @@ inline std::vector<std::basic_string<T> > str_split(
*/
inline std::string lowercase(const std::string &str)
{
- std::string s2;
+ std::string s2 = "";
s2.reserve(str.size());
diff --git a/src/util/thread.h b/src/util/thread.h
index d43e06e0a..f54b8b48f 100644
--- a/src/util/thread.h
+++ b/src/util/thread.h
@@ -29,9 +29,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "container.h"
template<typename T>
-class MutexedVariable {
+class MutexedVariable
+{
public:
- MutexedVariable(T value):
+ MutexedVariable(const T &value):
m_value(value)
{}
@@ -41,21 +42,14 @@ public:
return m_value;
}
- void set(T value)
+ void set(const T &value)
{
MutexAutoLock lock(m_mutex);
m_value = value;
}
- // You'll want to grab this in a SharedPtr
- MutexAutoLock *getLock()
- {
- return new MutexAutoLock(m_mutex);
- }
-
// You pretty surely want to grab the lock when accessing this
T m_value;
-
private:
Mutex m_mutex;
};