boost: update to 1.42.0

[features.git] / boost / libs / regex / src / static_mutex.cpp

diff --git a/boost/libs/regex/src/static_mutex.cpp b/boost/libs/regex/src/static_mutex.cpp
index cef76783bfffefdbf5b90f06bcc36a88f2ffd452..d14feb1e9b96132d0b3b3724de6de09cf212fc75 100755 (executable)
--- a/boost/libs/regex/src/static_mutex.cpp
+++ b/boost/libs/regex/src/static_mutex.cpp
@@ -124,7 +124,7 @@ void scoped_static_mutex_lock::unlock()
 boost::recursive_mutex* static_mutex::m_pmutex = 0;
 boost::once_flag static_mutex::m_once = BOOST_ONCE_INIT;
 
-extern "C" BOOST_REGEX_DECL void free_static_mutex()
+extern "C" BOOST_REGEX_DECL void boost_regex_free_static_mutex()
 {
    delete static_mutex::m_pmutex;
    static_mutex::m_pmutex = 0;
@@ -133,7 +133,7 @@ extern "C" BOOST_REGEX_DECL void free_static_mutex()
 void static_mutex::init()
 {
    m_pmutex = new boost::recursive_mutex();
-   int r = atexit(free_static_mutex);
+   int r = atexit(boost_regex_free_static_mutex);
    BOOST_ASSERT(0 == r);
 }
 
@@ -157,7 +157,7 @@ void scoped_static_mutex_lock::lock()
    {
        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, false);
+         m_plock = new boost::recursive_mutex::scoped_lock(*static_mutex::m_pmutex, boost::defer_lock);
       m_plock->lock();
       m_have_lock = true;
    }