summaryrefslogtreecommitdiff
path: root/src/lib/exception_store.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-06 20:17:47 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-11 11:56:23 +0000
commit6fa353595ce8f784b7d5004a6c38c78bddae94c7 (patch)
treed50c1273d519d97f3c4ad5e6ca4532f3ecbaa6d9 /src/lib/exception_store.h
parent17df947ac256397311a11894062070f8069c7e75 (diff)
Split EncodeServer into that and Server.
Diffstat (limited to 'src/lib/exception_store.h')
-rw-r--r--src/lib/exception_store.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/exception_store.h b/src/lib/exception_store.h
index d7c34c0f4..de0bed029 100644
--- a/src/lib/exception_store.h
+++ b/src/lib/exception_store.h
@@ -46,7 +46,7 @@ class ExceptionStore
{
public:
void rethrow () {
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_exception_mutex);
if (_exception) {
boost::exception_ptr tmp = _exception;
_exception = boost::exception_ptr ();
@@ -57,13 +57,13 @@ public:
protected:
void store_current () {
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_exception_mutex);
_exception = boost::current_exception ();
}
private:
boost::exception_ptr _exception;
- mutable boost::mutex _mutex;
+ mutable boost::mutex _exception_mutex;
};
#endif