[Boost-commit] svn:boost r58812 - in trunk: boost/regex/pending libs/regex/src

Subject: [Boost-commit] svn:boost r58812 - in trunk: boost/regex/pending libs/regex/src
From: john_at_[hidden]
Date: 2010-01-08 06:59:23

Author: johnmaddock
Date: 2010-01-08 06:59:23 EST (Fri, 08 Jan 2010)
New Revision: 58812
URL: http://svn.boost.org/trac/boost/changeset/58812

Log:
Change name of extern "C" function so it's prefixed with "boost_"
Text files modified: 
   trunk/boost/regex/pending/static_mutex.hpp |     2 +-                                      
   trunk/libs/regex/src/static_mutex.cpp      |     4 ++--                                    
   2 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/regex/pending/static_mutex.hpp
==============================================================================
--- trunk/boost/regex/pending/static_mutex.hpp	(original)
+++ trunk/boost/regex/pending/static_mutex.hpp	2010-01-08 06:59:23 EST (Fri, 08 Jan 2010)
@@ -140,7 +140,7 @@
 namespace boost{
 
 class BOOST_REGEX_DECL scoped_static_mutex_lock;
-extern "C" BOOST_REGEX_DECL void free_static_mutex();
+extern "C" BOOST_REGEX_DECL void boost_regex_free_static_mutex();
 
 class BOOST_REGEX_DECL static_mutex
 {

Modified: trunk/libs/regex/src/static_mutex.cpp
==============================================================================
--- trunk/libs/regex/src/static_mutex.cpp	(original)
+++ trunk/libs/regex/src/static_mutex.cpp	2010-01-08 06:59:23 EST (Fri, 08 Jan 2010)
@@ -124,7 +124,7 @@
 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 @@
 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);
 }