summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2012-11-05 17:29:20 -0800
committerYehuda Sadeh <yehuda@inktank.com>2012-11-08 13:24:29 -0800
commitb69da4b8dbc5dedcbe13991c856d3b7be259ff78 (patch)
treea61152eed6ee9bb41055e251d13de08243d23cc0
parentfeb24afb63ad40fb8b12a01ea94e0e4c156d13b7 (diff)
downloadceph-b69da4b8dbc5dedcbe13991c856d3b7be259ff78.tar.gz
json_spirit: thread safe
apparently the library is not thread safe by default. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r--src/Makefile.am2
-rw-r--r--src/json_spirit/json_spirit_reader_template.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ce0f0a753e1..6226bf2a9e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ check-local:
$(srcdir)/test/encoding/check-generated.sh
$(srcdir)/test/encoding/readable.sh ../ceph-object-corpus
-EXTRALIBS = -luuid
+EXTRALIBS = -luuid -lboost_thread-mt
if FREEBSD
EXTRALIBS += -lexecinfo
endif
diff --git a/src/json_spirit/json_spirit_reader_template.h b/src/json_spirit/json_spirit_reader_template.h
index b814e916255..f87b59331b7 100644
--- a/src/json_spirit/json_spirit_reader_template.h
+++ b/src/json_spirit/json_spirit_reader_template.h
@@ -13,7 +13,7 @@
#include "json_spirit_value.h"
#include "json_spirit_error_position.h"
-//#define BOOST_SPIRIT_THREADSAFE // uncomment for multithreaded use, requires linking to boost.thread
+#define BOOST_SPIRIT_THREADSAFE // uncomment for multithreaded use, requires linking to boost.thread
#include <boost/bind.hpp>
#include <boost/function.hpp>