Ticket #9456: impl.patch

grammar.ipp

@@ -23 +23 @@
 #include <boost/spirit/home/classic/core/non_terminal/impl/static.hpp>
 #include <boost/thread/tss.hpp>
 #include <boost/thread/mutex.hpp>
+#include <boost/thread/lock_types.hpp>
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -178 +179 @@
                 result(new definition_t(target_grammar->derived()));
 
 #ifdef BOOST_SPIRIT_THREADSAFE
-            boost::mutex::scoped_lock lock(helpers.mutex());
+            boost::unique_lock<boost::mutex> lock(helpers.mutex());
 #endif
             helpers.push_back(this);
 

object_with_id.ipp

@@ -15 +15 @@
 
 #ifdef BOOST_SPIRIT_THREADSAFE
 #include <boost/thread/mutex.hpp>
+#include <boost/thread/lock_types.hpp>
 #include <boost/thread/once.hpp>
 #endif
 
@@ -99 +100 @@
         object_with_id_base_supply<IdT>::acquire()
         {
 #ifdef BOOST_SPIRIT_THREADSAFE
-            boost::mutex::scoped_lock lock(mutex);
+            boost::unique_lock<boost::mutex> lock(mutex);
 #endif
             if (free_ids.size())
             {
@@ -121 +122 @@
         object_with_id_base_supply<IdT>::release(IdT id)
         {
 #ifdef BOOST_SPIRIT_THREADSAFE
-            boost::mutex::scoped_lock lock(mutex);
+            boost::unique_lock<boost::mutex> lock(mutex);
 #endif
             if (max_id == id)
                 max_id--;
@@ -139 +140 @@
                 static boost::once_flag been_here = BOOST_ONCE_INIT;
                 boost::call_once(been_here, mutex_init);
                 boost::mutex &mutex = mutex_instance();
-                boost::mutex::scoped_lock lock(mutex);
+                boost::unique_lock<boost::mutex> lock(mutex);
 #endif
                 static boost::shared_ptr<object_with_id_base_supply<IdT> >
                     static_supply;