Ticket #9461: static_mutex.patch

boost/regex/pending/static_mutex.hpp

@@ -127 +127 @@
 //
 #define B1 <boost/thread/once.hpp>
 #define B2 <boost/thread/recursive_mutex.hpp>
+#define B3 <boost/thread/lock_types.hpp>
 #include B1
 #include B2
+#include B3
 #undef B1
 #undef B2
+#undef B3
 
 namespace boost{
 
@@ -158 +161 @@
    void lock();
    void unlock();
 private:
-   boost::recursive_mutex::scoped_lock* m_plock;
+   boost::unique_lock<boost::recursive_mutex>* m_plock;
    bool m_have_lock;
 };
 

libs/regex/src/static_mutex.cpp

@@ -157 +157 @@
    {
        boost::call_once(static_mutex::m_once,&static_mutex::init);
       if(0 == m_plock)
-         m_plock = new boost::recursive_mutex::scoped_lock(*static_mutex::m_pmutex, boost::defer_lock);
+         m_plock = new boost::unique_lock<boost::recursive_mutex>(*static_mutex::m_pmutex, boost::defer_lock);
       m_plock->lock();
       m_have_lock = true;
    }