Release 1.40.0

[SVN r55802]

build/Jamfile.v2

@@ -192,18 +192,11 @@ if [ check-icu-config ]
 if $(gHAS_ICU)
 {
    BOOST_REGEX_ICU_OPTS = "<target-os>freebsd:<include>/usr/local/include" ;
-   ICU_SEARCH_OPTS = "<target-os>freebsd:<search>$(ICU_PATH)/lib" ; 
+   ICU_SEARCH_OPTS = "<target-os>freebsd:<search>/$(ICU_PATH)/lib" ; 
    BOOST_REGEX_ICU_OPTS += "<define>BOOST_HAS_ICU=1" ;
    
    if $(ICU_PATH)
    {
-      # If ICU_PATH is specified on the command line, then it's
-      # relative to the current directory, while paths specified
-      # in a Jamfile are relative to that Jamfile. So, to
-      # avoid confusing the user if he's not running from
-      # libs/regex/build, explicitly root this.
-      ICU_PATH = [ path.native 
-          [ path.root [ path.make $(ICU_PATH) ] [ path.pwd ] ] ] ;
       if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local"
       {
          BOOST_REGEX_ICU_OPTS += "<include>$(ICU_PATH)/include" ;

include/boost/regex/v4/basic_regex_parser.hpp

@@ -2008,7 +2008,7 @@ insert_recursion:
          v = static_cast<int>(hash_value_from_capture_name(base, m_position));
          re_brace* br = static_cast<re_brace*>(this->append_state(syntax_element_assert_backref, sizeof(re_brace)));
          br->index = v;
-         if(((*m_position != charT('>')) && (*m_position != charT('\''))) || (++m_position == m_end))
+         if((*m_position != charT('>')) && (*m_position != charT('\'')) || (++m_position == m_end))
          {
             fail(regex_constants::error_badrepeat, m_position - m_base);
             return false;

src/static_mutex.cpp

@@ -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, boost::defer_lock);
+         m_plock = new boost::recursive_mutex::scoped_lock(*static_mutex::m_pmutex, false);
       m_plock->lock();
       m_have_lock = true;
    }