From a0fff90c261d42326eeebabb1c758f3942451eac Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Fri, 5 Oct 2007 09:46:00 +0000
Subject: [PATCH 01/16] Updated in line with RC 1.34

[SVN r39693]
---
 build/Jamfile                             |  122 --
 build/Jamfile.v2                          |    2 +-
 build/threads.jam                         |   65 -
 build/threads.mcp                         |  Bin 5727 -> 0 bytes
 doc/acknowledgements.xml                  |    5 +
 doc/build.xml                             |  131 +-
 doc/concepts.xml                          |   29 +-
 doc/entities.xml                          |    1 +
 doc/read_write_mutex-ref.xml              |   30 +
 doc/reference.xml                         |    6 +
 doc/release_notes.xml                     |   58 +-
 doc/thread-ref.xml                        |   15 +-
 include/boost/thread/barrier.hpp          |    2 +-
 include/boost/thread/condition.hpp        |    1 +
 include/boost/thread/mutex.hpp            |    1 +
 include/boost/thread/read_write_mutex.hpp |  285 ----
 include/boost/thread/tss.hpp              |    1 +
 src/condition.cpp                         |   20 +
 src/mutex.inl                             |   18 +-
 src/once.cpp                              |   21 +-
 src/read_write_mutex.cpp                  | 1732 ---------------------
 src/recursive_mutex.cpp                   |    6 +-
 src/thread.cpp                            |   35 +-
 src/timeconv.inl                          |    1 +
 src/tss.cpp                               |   12 +-
 src/tss_hooks.cpp                         |  289 ++--
 test/Jamfile.v2                           |    2 +-
 test/test_read_write_mutex.cpp            |  786 ----------
 test/test_tss.cpp                         |    9 +-
 test/util.inl                             |    2 +
 tutorial/Jamfile                          |   34 -
 31 files changed, 476 insertions(+), 3245 deletions(-)
 delete mode 100644 build/Jamfile
 delete mode 100644 build/threads.jam
 delete mode 100644 build/threads.mcp
 delete mode 100644 include/boost/thread/read_write_mutex.hpp
 delete mode 100644 src/read_write_mutex.cpp
 delete mode 100644 test/test_read_write_mutex.cpp
 delete mode 100644 tutorial/Jamfile

diff --git a/build/Jamfile b/build/Jamfile
deleted file mode 100644
index 874a595f..00000000
--- a/build/Jamfile
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright (C) 2001-2003
-# William E. Kempf
-#
-#  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-#  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#
-# Boost.Threads build Jamfile
-#
-# Additional configuration variables used:
-#   See threads.jam.
-
-# Declare the location of this subproject relative to the root.
-subproject libs/thread/build ;
-
-# Include threads.jam for Boost.Threads global build information.
-# This greatly simplifies the Jam code needed to configure the build
-# for the various Win32 build types.
-import ./threads ;
-
-{
-    CPP_SOURCES =
-        barrier
-        condition
-        exceptions
-        mutex
-        once
-        recursive_mutex
-        read_write_mutex
-        thread
-        tss_hooks
-        tss_dll
-        tss_pe
-        tss
-        xtime
-        ;
-
-    template boost_thread_lib_base
-        : ## sources ##
-          <template>thread_base
-          ../src/$(CPP_SOURCES).cpp
-        : ## requirements ##
-          <sysinclude>$(BOOST_ROOT) #:should be unnecessary (because already included in thread_base)
-          <define>BOOST_THREAD_BUILD_LIB=1
-          # the common names rule ensures that the library will
-          # be named according to the rules used by the install
-          # and auto-link features:
-          common-variant-tag
-        : ## default build ##
-    ;
-
-    template boost_thread_dll_base
-        : ## sources ##
-          <template>thread_base
-          ../src/$(CPP_SOURCES).cpp
-        : ## requirements ##
-          <sysinclude>$(BOOST_ROOT) #:should be unnecessary (because already included in thread_base)
-          <define>BOOST_THREAD_BUILD_DLL=1
-          <runtime-link>dynamic
-          # the common names rule ensures that the library will
-          # be named according to the rules used by the install
-          # and auto-link features:
-          common-variant-tag
-        : ## default build ##
-    ;
-
-    lib $(boost_thread_lib_name)
-        : ## sources ##
-          <template>boost_thread_lib_base
-        : ## requirements ##
-          <define>BOOST_THREAD_LIB_NAME=$(boost_thread_lib_name)
-        : ## default build ##
-    ;
-
-    dll $(boost_thread_lib_name)
-        : ## sources ##
-          <template>boost_thread_dll_base
-        : ## requirements ##
-          <define>BOOST_THREAD_LIB_NAME=$(boost_thread_lib_name)
-        : ## default build ##
-    ;
-
-    stage bin-stage
-        : <dll>$(boost_thread_lib_name)
-          <lib>$(boost_thread_lib_name)
-    ;
-
-    install thread lib
-        : <dll>$(boost_thread_lib_name)
-          <lib>$(boost_thread_lib_name)
-    ;
-
-    if $(boost_thread_lib_settings_ptw32)
-    {
-        lib $(boost_thread_lib_name_ptw32)
-            : ## sources ##
-              <template>boost_thread_lib_base
-            : ## requirements ##
-              <define>BOOST_THREAD_LIB_NAME=$(boost_thread_lib_name_ptw32)
-              $(boost_thread_lib_settings_ptw32)
-            : ## default build ##
-        ;
-
-        dll $(boost_thread_lib_name_ptw32)
-            : ## sources ##
-              <template>boost_thread_dll_base
-            : ## requirements ##
-              <define>BOOST_THREAD_LIB_NAME=$(boost_thread_lib_name_ptw32)
-              $(boost_thread_lib_settings_ptw32)
-            : ## default build ##
-        ;
-
-        stage bin-stage
-            : <dll>$(boost_thread_lib_name_ptw32)
-              <lib>$(boost_thread_lib_name_ptw32)
-        ;
-
-        install thread lib
-            : <dll>$(boost_thread_lib_name_ptw32)
-              <lib>$(boost_thread_lib_name_ptw32)
-        ;
-    }
-}
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 872f2939..cc97011b 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -20,7 +20,7 @@ CPP_SOURCES =
         mutex
         once
         recursive_mutex
-        read_write_mutex
+#        read_write_mutex
         thread
         tss_hooks
         tss_dll
diff --git a/build/threads.jam b/build/threads.jam
deleted file mode 100644
index 9f146fd5..00000000
--- a/build/threads.jam
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (C) 2001-2003
-# William E. Kempf
-#
-#  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-#  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-# Additional configuration variables used:
-#   1. PTW32_DIR and PTW32_LIB may be used on Win32 platforms to specify that
-#      a version of Boost.Threads should be built that uses the
-#      the pthreads-win32 library instead of the Win32 native threading APIs.
-#      This feature is mostly used for testing and it's generally recommended
-#      that you use the Win32 native threading libraries instead. 
-#
-#      PTW32_Dir should be set to the installation path of the
-#      pthreads-win32 library and PTW32_LIB should be set to the name of the 
-#      library variant to link against (see the pthreads-win32 documentation).
-#      Example: jam -sPTW32_DIR="c:\pthreads-win32" -sPTW32_LIB="pthreadVCE.lib"
-#      Alternately, environment variables having the names PTW32_DIR and PTW32_LIB
-#      can be set instead of passing these values on the command line.
-#
-#      In either case, libraries having the names boost_thread_ptw32<tags>.dll
-#      and libboost_thread_ptw32<tags>.lib will be built
-#      in addition to the usual boost_thread<tags>.dll and 
-#      libboost_thread<tags>.lib. Link with one of the ptw32 versions
-#      of the Boost.Threads libraries to use the version of Boost.Threads
-#      that is implemented using pthreads-win32 (you will need to #define
-#      BOOST_THREAD_NO_LIB or BOOST_ALL_NO_LIB to disable auto-linking
-#      if your platform supports auto-linking in order to prevent
-#      your build from attempting to link to two different versions of 
-#      the Boost.Threads library).
-
-# Do some OS-specific setup
-{
-    #thread library name
-    boost_thread_lib_name = boost_thread ; 
-    
-    #thread library name with "pthreads-win32" library
-    boost_thread_lib_name_ptw32 = boost_thread_ptw32 ;
-    
-    if $(NT)
-    {
-        if $(PTW32_DIR)
-        {
-            if $(PTW32_LIB)
-            {
-                boost_thread_lib_settings_ptw32 =
-                    <define>BOOST_HAS_PTHREADS
-                    <define>PtW32NoCatchWarn
-                    <include>$(PTW32_DIR)/pre-built/include
-                    <library-file>$(PTW32_DIR)/pre-built/lib/$(PTW32_LIB)
-                ;
-            }
-        }
-    }
-
-    template thread_base
-        : ## sources ##
-        : ## requirements ##
-          <sysinclude>$(BOOST_ROOT)
-          <threading>multi
-          <borland><*><cxxflags>-w-8004
-          <borland><*><cxxflags>-w-8057
-        : ## default build ##
-    ;
-}
diff --git a/build/threads.mcp b/build/threads.mcp
deleted file mode 100644
index ba3aaeff3e809f5e7b588a09ca12b52a095c0fe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5727
zcmYe!&(C3CU|?ooVANn>jNxNoj5T9mP*9LyU|>jOWMX810q6Xb)bPZjqRjjvg@B^`
ztkmQZnAC`%ofC_a^79meOHve^wY3$T^Ye=Hb5gB>Qgic5QWacMlS<PWaHw%CEy>p{
zNi0fFEy1NEATc>RF+H_NAs{g?H3yff;QZ2}<Wz-_qSVx4TxuMXlT(X}6#^1VGH|K^
zyB1_yP-$LCW^O7jvqHdbRtQclDap)B$7!5fW=^VtZ(>0KK1EKYnK>y6t`#Lki8u{{
zy9;75E@wHH7MJAbDtM<>mgg6x;55z5!dn59YTZ-waG3;B;*wdMSX`W%o0OAUgioD&
zPJU8ij)H$dNoH<l6@IlonR(gxRlu?kjwIu(4@qRX1(|r91yL2ASd@n^<elAo%`Cie
zdCe^(0Dq$MN-RrMaL&)oP0UMC@X5@>nOeXKeG>E1OB2)aEAkEUax5qSrwH7k1UAmU
zw4|UEXRZM&ArO)vH7@zd@G=WWfcqvU`v)udrWU2A;tvjpixk{)5^-mUfB<JgDG#KC
zn3M-nM{LRisl}i2Kq>-U-EgG^ur#!6#}Q5e0nU!ax%h)9D76ZdU?52s8a)c&Lc%Ar
z7-wXHEQe-S1>eNv3|)VG&V;A{rAIs&4P+!#A^s92JTor{6lM6cTZM%gp=bpuAtqWu
z>Rc<5QwvHm^YcKZHJ(x*q?Xtu08)!T34l~U;{<2;g7XZhMoZ7kOJ{J(&o3^~3&|)-
zO-!*use({sP%0i28F;Y{t8P$aAu)rfWKbl*sRmxPph$s>4_JkQA_KP%Vl=7;P%3N`
zZOGL$iUfLngDQzyQe%;Wm(M72m<0}sG)ggpB7@dcK$Sx(cyLL;G8cwCO1j06#Ylk|
zDxm2OLmZj|2}om$D^UIg6;~KW!V)mL1fpm{kwGbtkY$Q-r{`iToC&(v3ZBBSrRZWS
zh+nWL>0&F~X}Z`7XQD>36Jk0_sxC%thoX8BSGq2?!k4g%tst!n=X_|Ph-xTA5^K^f
zw!)vbi>+`b?qVxEsk_(;lpdf}1e*7eWU!@gh*q2l93qW3g+r8JNy88c+-V#|9&6Nr
z+>V~gA-b?7bFd8dbPh@dNHs4?gh6^Jc#=C*0q#T(Re(R~Llr^%i6a9*)!@knP!+f{
z15^RrEfD)q(*#rv&how(ssLy9fXd^|Brr9&D*>1__%aOC6av`>stR}Jfhxe4g<wi>
z)Dtkrf|4XOqhZZXNXFpKR7i^OXDuX!*fJQBG@fjRsR~b`0QnCi%ORP7HRB=Vab!QJ
z0+iZjM2wA$dU7-bMo0+221HdD7#NtKes+fppn`e13=9k`U={<zL<R;1Rw#Qb0|Nsa
zlzo?hfq@;uW(29_fU-3iKqIdT3Q(>u0|NsWlnokd<%Y6nGcYjlK-v2k7#Mh=>}L!N
z415qalMn*~13#2)!oa{F0A+_WFfa&0*|iJ|3?OwNpDbozU=W6iA7o%)5P`BEF)%QQ
lLfFh8`^BJa0|o{LaVR^Afq?-uTnq{YkeQND@r4Ww3;>KipC|wT

diff --git a/doc/acknowledgements.xml b/doc/acknowledgements.xml
index 826e7f07..6e8c610a 100644
--- a/doc/acknowledgements.xml
+++ b/doc/acknowledgements.xml
@@ -63,6 +63,11 @@ last-revision="$Date$">
   Steve Cleary, Steven Kirk, Thomas Holenstein, Thomas Matelich, Trevor
   Perrin, Valentin Bonnard, Vesa Karvonen, Wayne Miller, and William
   Kempf.</para>
+  <para>
+  As of February 2006 Anthony Williams and Roland Schwarz took over maintainance 
+  and further development of the library after it has been in an orphaned state
+  for a rather long period of time. 
+  </para>
   <para>Apologies for anyone inadvertently missed.</para>
 </section>
 
diff --git a/doc/build.xml b/doc/build.xml
index 7511b9a6..bed1c7a7 100644
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -5,6 +5,7 @@
   %thread.entities;
 ]>
 <!-- Copyright (c) 2002-2003 William E. Kempf, Michael Glassford
+     Copyright (c) 2007 Roland Schwarz
      Subject to the Boost Software License, Version 1.0. 
      (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
 -->
@@ -25,38 +26,112 @@
 	</para>
 	<section id="thread.build.building">
 		<title>Building the &Boost.Thread; Libraries</title>
-		<para>
-	To build the &Boost.Thread; libraries using &Boost.Build;, simply change to the
-	directory <emphasis>boost_root</emphasis>/libs/thread/build and execute the command:
-		<programlisting>bjam -sTOOLS=<emphasis>toolset</emphasis></programlisting>
-	This will create the debug and the release builds of the &Boost.Thread; library.
-	<note>Invoking the above command in <emphasis>boost_root</emphasis> will build all of 
-	the Boost distribution, including &Boost.Thread;.</note>
-		</para>
-		<para>
-	The Jamfile supplied with &Boost.Thread; produces a dynamic link library named
-	<emphasis>boost_thread{build-specific-tags}.{extension}</emphasis>, where the build-specific
-	tags indicate the toolset used to build the library, whether it's a debug or release
-	build, what version of Boost was used, etc.; and the extension is the appropriate extension
-	for a dynamic link library for the platform for which &Boost.Thread; is being built.
-	For instance, a debug library built for Win32 with VC++ 7.1 using Boost 1.31 would
-	be named <emphasis>boost_thread-vc71-mt-gd-1_31.dll</emphasis>.
-		</para>
-		<para>
-	The source files that are used to create the &Boost.Thread; library
-	are all of the *.cpp files found in <emphasis>boost_root</emphasis>/libs/thread/src.
-	These need to be built with the compiler's and linker's multi-threading support enabled.
-	If you want to create your own build solution you'll have to follow these same
-	guidelines. One of the most frequently reported problems when trying to do this
-	occurs from not enabling the compiler's and linker's support for multi-threading.
-		</para>
+        <para>
+            Building the &Boost.Thread; Library depends on how you intend to use it. You have several options:
+            <itemizedlist>
+                <listitem>
+                    Using as a <link linkend="thread.build.precompiled">precompiled</link> library, possibly
+                    with auto-linking, or for use from within an IDE.
+                </listitem>
+                <listitem>
+                    Use from a <link linkend="thread.build.bjam">&Boost.Build;</link> project.
+                </listitem>
+                <listitem>
+                    Using in <link linkend="thread.build.source">source</link> form.
+                </listitem>
+            </itemizedlist>
+        </para>
+        <section id="thread.build.precompiled">
+            <title>Precompiled</title>
+            <para>
+                Using the &Boost.Thread; library in precompiled form is the way to go if you want to
+                install the library to a standard place, from where your linker is able to resolve code
+                in binary form. You also will want this option if compile time is a concern. Multiple 
+                variants are available, for different toolsets and build variants (debug/release).
+                The library files are named <emphasis>{lead}boost_thread{build-specific-tags}.{extension}</emphasis>,
+                where the build-specific-tags indicate the toolset used to build the library, whether it's
+                a debug or release build, what version of &Boost; was used, etc.; and the lead and extension
+                are the appropriate extensions for a dynamic link library or static library for the platform
+                for which &Boost.Thread; is being built.
+            	For instance, a debug build of the dynamic library built for Win32 with VC++ 7.1 using Boost 1.34 would
+            	be named <emphasis>boost_thread-vc71-mt-gd-1_34.dll</emphasis>.
+                More information on this should be available from the &Boost.Build; documentation.
+            </para>
+            <para>
+                Building should be possible with the default configuration. If you are running into problems,
+                it might be wise to adjust your local settings of &Boost.Build; though. Typically you will
+                need to get your user-config.jam file to reflect your environment, i.e. used toolsets. Please
+                refer to the &Boost.Build; documentation to learn how to do this.
+            </para>
+            <para>
+                To create the libraries you need to open a command shell and change to the 
+                <emphasis>boost_root</emphasis> directory. From there you give the command 
+                <programlisting>bjam --toolset=<emphasis>mytoolset</emphasis> stage --with-thread</programlisting>
+                Replace <emphasis>mytoolset</emphasis> with the name of your toolset, e.g. msvc-7.1 .
+                This will compile and put the libraries into the <emphasis>stage</emphasis> directory which is just below the
+                <emphasis>boost_root</emphasis> directory. &Boost.Build; by default will generate static and 
+                dynamic variants for debug and release.
+            </para>
+            <note>
+                Invoking the above command without the --with-thread switch &Boost.Build; will build all of 
+	            the Boost distribution, including &Boost.Thread;.
+            </note>
+            <para>
+                The next step is to copy your libraries to a place where your linker is able to pick them up.
+                It is also quite possible to leave them in the stage directory and instruct your IDE to take them
+                from there.
+            </para>
+            <para>
+                In your IDE you then need to add <emphasis>boost_root</emphasis>/boost to the paths where the compiler
+                expects to find files to be included. For toolsets that support <emphasis>auto-linking</emphasis>
+                it is not necessary to explicitly specify the name of the library to link against, it is sufficient
+                to specify the path of the stage directory. Typically this is true on Windows. For gcc you need 
+                to specify the exact library name (including all the tags). Please don't forget that threading
+                support must be turned on to be able to use the library. You should be able now to build your
+                project from the IDE.
+            </para>
+	    </section>
+        <section id="thread.build.bjam">
+            <title>&Boost.Build; Project</title>
+            <para>
+                If you have decided to use &Boost.Build; as a build environment for your application, you simply
+                need to add a single line to your <emphasis>Jamroot</emphasis> file:
+                <programlisting>use-project /boost : {path-to-boost-root} ;</programlisting>
+                where <emphasis>{path-to-boost-root}</emphasis> needs to be replaced with the location of
+                your copy of the boost tree.
+                Later when you specify a component that needs to link against &Boost.Thread; you specify this
+                as e.g.:
+                <programlisting>exe myapp : {myappsources} /boost//thread ;</programlisting>
+                and you are done.
+            </para>
+        </section>
+        <section id="thread.build.source">
+            <title>Source Form</title>
+            <para>
+                Of course it is also possible to use the &Boost.Thread; library in source form.
+                First you need to specify the <emphasis>boost_root</emphasis>/boost directory as
+                a path where your compiler expects to find files to include. It is not easy
+                to isolate the &Boost.Thread; include files from the rest of the boost 
+                library though. You would also need to isolate every include file that the thread
+                library depends on. Next you need to copy the files from 
+                <emphasis>boost_root</emphasis>/libs/thread/src to your project and instruct your
+                build system to compile them together with your project. Please look into the
+                <emphasis>Jamfile</emphasis> in <emphasis>boost_root</emphasis>/libs/thread/build
+                to find out which compiler options and defines you will need to get a clean compile.
+                Using the boost library in this way is the least recommended, and should only be
+                considered if avoiding dependency on &Boost.Build; is a requirement. Even if so
+                it might be a better option to use the library in it's precompiled form. 
+                Precompiled downloads are available from the boost consulting web site, or as
+                part of most linux distributions.
+            </para>
+        </section>
 	</section>
 	<section id="thread.build.testing">
 		<title>Testing the &Boost.Thread; Libraries</title>
 		<para>
-	To test the &Boost.Thread; libraries using &Boost.Build;, simply change to the
-	directory <emphasis>boost_root</emphasis>/libs/thread/test and execute the command:
-			<programlisting>bjam -sTOOLS=<emphasis>toolset</emphasis> test</programlisting>
+	        To test the &Boost.Thread; libraries using &Boost.Build;, simply change to the
+	        directory <emphasis>boost_root</emphasis>/libs/thread/test and execute the command:
+			<programlisting>bjam --toolset=<emphasis>mytoolset</emphasis> test</programlisting>
 		</para>
 	</section>
 </section>
diff --git a/doc/concepts.xml b/doc/concepts.xml
index 63d6d8db..2004236c 100644
--- a/doc/concepts.xml
+++ b/doc/concepts.xml
@@ -18,7 +18,17 @@
 	which allow only one thread at a time to access a resource when it is
 	being modified (the "Write" part of Read/Write), but allows multiple threads
 	to access a resource when it is only being referenced (the "Read" part of
-	Read/Write).</para>
+    Read/Write).</para> 
+    <note> Unfortunately it turned out that the current implementation of Read/Write Mutex has     
+            some serious problems. So it was decided not to put this implementation into
+            release grade code. Also discussions on the mailing list led to the
+            conclusion that the current concepts need to be rethought. In particular
+            the schedulings <link linkend="thread.concepts.read-write-scheduling-policies.inter-class">
+                Inter-Class Scheduling Policies</link> are deemed unnecessary.
+            There seems to be common belief that a fair scheme suffices.
+            The following documentation has been retained however, to give
+            readers of this document the opportunity to study the original design.
+    </note>
 
 	<section id="thread.concepts.mutexes">
 		<title>Mutexes</title>
@@ -739,13 +749,18 @@
 
 	<section id="thread.concepts.read-write-mutexes">
 	<title>Read/Write Mutexes</title>
-		<note>Since the read/write mutex and related classes are new,
-		both interface and implementation are liable to change
-		in future releases of &Boost.Thread;.
-		The lock concepts and lock promotion and demotion in particular 
-		are still under discussion and very likely to change.</note>
+        <note> Unfortunately it turned out that the current implementation has
+            some serious problems. So it was decided not to put this implementation into
+            release grade code. Also discussions on the mailing list led to the
+            conclusion that the current concepts need to be rethought. In particular
+            the schedulings <link linkend="thread.concepts.read-write-scheduling-policies.inter-class">
+                Inter-Class Scheduling Policies</link> are deemed unnecessary.
+            There seems to be common belief that a fair scheme suffices.
+            The following documentation has been retained however, to give
+            readers of this document the opportunity to study the original design.
+        </note>
 
-		<para>A read/write mutex (short for reader/writer mutual-exclusion) object
+        <para>A read/write mutex (short for reader/writer mutual-exclusion) object
 		is used to serialize access to a resource shared between multiple 
 		threads, where multiple "readers" can share simultaneous access, but 
 		"writers" require exclusive access. The
diff --git a/doc/entities.xml b/doc/entities.xml
index 9dcb04db..a056e193 100644
--- a/doc/entities.xml
+++ b/doc/entities.xml
@@ -2,6 +2,7 @@
      Subject to the Boost Software License, Version 1.0. 
      (See accompanying file LICENSE-1.0 or  http://www.boost.org/LICENSE-1.0)
 -->
+<!ENTITY Boost "<emphasis role='bold'>Boost</emphasis>">
 <!ENTITY Boost.Thread "<emphasis role='bold'>Boost.Thread</emphasis>">
 <!ENTITY Boost.Build "<emphasis role='bold'>Boost.Build</emphasis>">
 <!ENTITY cite.AndrewsSchneider83  "<citation><xref
diff --git a/doc/read_write_mutex-ref.xml b/doc/read_write_mutex-ref.xml
index e059723e..46336961 100644
--- a/doc/read_write_mutex-ref.xml
+++ b/doc/read_write_mutex-ref.xml
@@ -37,6 +37,16 @@
 		<purpose>
 			<para>The <classname>read_write_mutex</classname> class is a model of the 
 			<link linkend="thread.concepts.ReadWriteMutex">ReadWriteMutex</link> concept.</para>
+    <note> Unfortunately it turned out that the current implementation of Read/Write Mutex has     
+            some serious problems. So it was decided not to put this implementation into
+            release grade code. Also discussions on the mailing list led to the
+            conclusion that the current concepts need to be rethought. In particular
+            the schedulings <link linkend="thread.concepts.read-write-scheduling-policies.inter-class">
+                Inter-Class Scheduling Policies</link> are deemed unnecessary.
+            There seems to be common belief that a fair scheme suffices.
+            The following documentation has been retained however, to give
+            readers of this document the opportunity to study the original design.
+    </note>
 		</purpose>
 		
 		<description>
@@ -160,6 +170,16 @@
 		<purpose>
 			<para>The <classname>try_read_write_mutex</classname> class is a model of the 
 			<link linkend="thread.concepts.TryReadWriteMutex">TryReadWriteMutex</link> concept.</para>
+    <note> Unfortunately it turned out that the current implementation of Read/Write Mutex has     
+            some serious problems. So it was decided not to put this implementation into
+            release grade code. Also discussions on the mailing list led to the
+            conclusion that the current concepts need to be rethought. In particular
+            the schedulings <link linkend="thread.concepts.read-write-scheduling-policies.inter-class">
+                Inter-Class Scheduling Policies</link> are deemed unnecessary.
+            There seems to be common belief that a fair scheme suffices.
+            The following documentation has been retained however, to give
+            readers of this document the opportunity to study the original design.
+    </note>
 		</purpose>
 		
 		<description>
@@ -302,6 +322,16 @@
 		<purpose>
 			<para>The <classname>timed_read_write_mutex</classname> class is a model of the 
 			<link linkend="thread.concepts.TimedReadWriteMutex">TimedReadWriteMutex</link> concept.</para>
+    <note> Unfortunately it turned out that the current implementation of Read/Write Mutex has     
+            some serious problems. So it was decided not to put this implementation into
+            release grade code. Also discussions on the mailing list led to the
+            conclusion that the current concepts need to be rethought. In particular
+            the schedulings <link linkend="thread.concepts.read-write-scheduling-policies.inter-class">
+                Inter-Class Scheduling Policies</link> are deemed unnecessary.
+            There seems to be common belief that a fair scheme suffices.
+            The following documentation has been retained however, to give
+            readers of this document the opportunity to study the original design.
+    </note>
 		</purpose>
 		
 		<description>
diff --git a/doc/reference.xml b/doc/reference.xml
index fea85f30..a9167d02 100644
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -17,6 +17,12 @@
   <xi:include href="mutex-ref.xml"/>
   <xi:include href="once-ref.xml"/>
   <xi:include href="recursive_mutex-ref.xml"/>
+<!--
+  The read_write_mutex is held back from release, since the
+  implementation suffers from a serious, yet unresolved bug.
+  The implementation is likely to appear in a reworked
+  form in the next release.
+-->
   <xi:include href="read_write_mutex-ref.xml"/>
   <xi:include href="thread-ref.xml"/>
   <xi:include href="tss-ref.xml"/>
diff --git a/doc/release_notes.xml b/doc/release_notes.xml
index df560fcb..2eec6e85 100644
--- a/doc/release_notes.xml
+++ b/doc/release_notes.xml
@@ -10,7 +10,63 @@
 -->
 <section id="thread.release_notes" last-revision="$Date$">
 	<title>Release Notes</title>
-	<section id="thread.release_notes.boost_1_32_0">
+    <section id="thread.release_notes.boost_1_34_0">
+        <title>Boost 1.34.0</title>
+
+        <section id="thread.release_notes.boost_1_34_0.change_log.maintainance">
+            <title>New team of maintainers</title>
+
+            <para>
+                Since the original author William E. Kempf no longer is available to
+                maintain the &Boost.Thread; library, a new team has been formed
+                in an attempt to continue the work on &Boost.Thread;.
+                Fortunately William E. Kempf has given
+                <ulink url="http://lists.boost.org/Archives/boost/2006/09/110143.php">
+                    permission </ulink> 
+                to use his work under the boost license.
+            </para>
+            <para>
+                The team currently consists of
+                <itemizedlist>
+                    <listitem>
+                        Anthony Williams, for the Win32 platform,
+                    </listitem>
+                    <listitem>
+                        Roland Schwarz, for the linux platform, and various "housekeeping" tasks.
+                    </listitem>
+                </itemizedlist>
+                Volunteers for other platforms are welcome!
+            </para>
+            <para>
+                As the &Boost.Thread; was kind of orphaned over the last release, this release
+                attempts to fix the known bugs. Upcoming releases will bring in new things.
+            </para>
+        </section>
+
+        <section id="thread.release_notes.boost_1_34_0.change_log.read_write_mutex">
+            <title>read_write_mutex still broken</title>
+
+            <para>
+                <note>
+                    It has been decided not to release the Read/Write Mutex, since the current
+                    implementation suffers from a serious bug. The documentation of the concepts
+                    has been included though, giving the interested reader an opportunity to study the
+                    original concepts. Please refer to the following links if you are interested
+                    which problems led to the decision to held back this mutex type.The issue
+                    has been discovered before 1.33 was released and the code has
+                    been omitted from that release. A reworked mutex is expected to appear in 1.35.
+                    Also see:  
+                    <ulink url="http://lists.boost.org/Archives/boost/2005/08/92307.php">
+                        read_write_mutex bug</ulink> 
+                    and 
+                    <ulink url="http://lists.boost.org/Archives/boost/2005/09/93180.php">
+                        read_write_mutex fundamentally broken in 1.33</ulink>
+                </note>
+            </para>
+        </section>
+
+    </section>
+    <section id="thread.release_notes.boost_1_32_0">
 		<title>Boost 1.32.0</title>
 
 		<section id="thread.release_notes.boost_1_32_0.change_log.documentation">
diff --git a/doc/thread-ref.xml b/doc/thread-ref.xml
index 8ab7a617..ad33271b 100644
--- a/doc/thread-ref.xml
+++ b/doc/thread-ref.xml
@@ -264,20 +264,7 @@
 				<effects>Calls <code>join()</code> on each of the managed 
 				<classname>thread</classname> objects.</effects>
 			</method>
-        </method-group>
-        
-        <method-group name="capacity">
-            
-            <method name="size" cv="const">
-                <type>int</type>
-                
-                <returns>the number of <classname>thread</classname> 
-                    objects in the group
-                </returns>
-
-            </method>
-
-        </method-group>
+		</method-group>
 	</class>
   </namespace>
 </header>
diff --git a/include/boost/thread/barrier.hpp b/include/boost/thread/barrier.hpp
index bb1be49b..8048784c 100644
--- a/include/boost/thread/barrier.hpp
+++ b/include/boost/thread/barrier.hpp
@@ -29,7 +29,7 @@ private:
 #ifdef BOOST_MSVC
 #   pragma warning(push)
 #   pragma warning(disable: 4251 4231 4660 4275)
-#endif    
+#endif
     condition m_cond;
 #ifdef BOOST_MSVC
 #   pragma warning(pop)
diff --git a/include/boost/thread/condition.hpp b/include/boost/thread/condition.hpp
index 9fddf8de..e5a1c317 100644
--- a/include/boost/thread/condition.hpp
+++ b/include/boost/thread/condition.hpp
@@ -28,6 +28,7 @@ struct xtime;
 #   pragma warning(push)
 #   pragma warning(disable: 4251 4231 4660 4275)
 #endif
+
 namespace detail {
 
 class BOOST_THREAD_DECL condition_impl : private noncopyable
diff --git a/include/boost/thread/mutex.hpp b/include/boost/thread/mutex.hpp
index 6ad04f0f..1b74da55 100644
--- a/include/boost/thread/mutex.hpp
+++ b/include/boost/thread/mutex.hpp
@@ -29,6 +29,7 @@ struct xtime;
 #   pragma warning(push)
 #   pragma warning(disable: 4251 4231 4660 4275)
 #endif
+
 class BOOST_THREAD_DECL mutex
     : private noncopyable
 {
diff --git a/include/boost/thread/read_write_mutex.hpp b/include/boost/thread/read_write_mutex.hpp
deleted file mode 100644
index 0f3e325b..00000000
--- a/include/boost/thread/read_write_mutex.hpp
+++ /dev/null
@@ -1,285 +0,0 @@
-// Copyright (C)  2002-2003
-// David Moore, William E. Kempf, Michael Glassford
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-// A Boost::threads implementation of a synchronization
-//   primitive which can allow multiple readers or a single
-//   writer to have access to a shared resource.
-
-#ifndef BOOST_READ_WRITE_MUTEX_JDM030602_HPP
-#define BOOST_READ_WRITE_MUTEX_JDM030602_HPP
-
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/utility.hpp>
-#include <boost/detail/workaround.hpp>
-
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/detail/lock.hpp>
-#include <boost/thread/detail/read_write_lock.hpp>
-#include <boost/thread/condition.hpp>
-
-namespace boost {
-// disable warnings about non dll import
-// see: http://www.boost.org/more/separate_compilation.html#dlls
-#ifdef BOOST_MSVC
-#   pragma warning(push)
-#   pragma warning(disable: 4251 4231 4660 4275)
-#endif
-namespace read_write_scheduling_policy {
-    enum read_write_scheduling_policy_enum
-    {
-        writer_priority,               //Prefer writers; can starve readers
-        reader_priority,               //Prefer readers; can starve writers
-        alternating_many_reads,        //Alternate readers and writers; before a writer, release all queued readers 
-        alternating_single_read        //Alternate readers and writers; before a writer, release only one queued reader
-    };
-} // namespace read_write_scheduling_policy
-
-namespace detail {
-
-namespace thread {
-
-// Shared implementation construct for explicit Scheduling Policies
-// This implementation is susceptible to self-deadlock, though....
-template<typename Mutex>
-struct read_write_mutex_impl
-{
-    typedef Mutex mutex_type;
-    typedef detail::thread::scoped_lock<Mutex> scoped_lock;
-    typedef detail::thread::scoped_try_lock<Mutex> scoped_try_lock;
-    typedef detail::thread::scoped_timed_lock<Mutex> scoped_timed_lock;
-
-    read_write_mutex_impl(read_write_scheduling_policy::read_write_scheduling_policy_enum sp);
-#if !BOOST_WORKAROUND(__BORLANDC__,<= 0x564)
-    ~read_write_mutex_impl();
-#endif
-
-    Mutex m_prot;
-
-    const read_write_scheduling_policy::read_write_scheduling_policy_enum m_sp;
-    int m_state; //-1 = write lock; 0 = unlocked; >0 = read locked
-
-    boost::condition m_waiting_writers;
-    boost::condition m_waiting_readers;
-    boost::condition m_waiting_promotion;
-    int m_num_waiting_writers;
-    int m_num_waiting_readers;
-    bool m_state_waiting_promotion;
-
-    int m_num_waking_writers;
-    int m_num_waking_readers;
-    int m_num_max_waking_writers; //Debug only
-    int m_num_max_waking_readers; //Debug only
-
-    bool m_readers_next;
-
-    void do_read_lock();
-    void do_write_lock();
-    void do_write_unlock();
-    void do_read_unlock();
-    bool do_try_write_lock();
-    bool do_try_read_lock();
-    bool do_timed_write_lock(const xtime &xt);
-    bool do_timed_read_lock(const xtime &xt);
-
-    void do_demote_to_read_lock();
-    bool do_try_demote_to_read_lock();
-    bool do_timed_demote_to_read_lock(const xtime &xt);
-
-    void do_promote_to_write_lock();
-    bool do_try_promote_to_write_lock();
-    bool do_timed_promote_to_write_lock(const xtime &xt);
-
-    bool locked();
-    read_write_lock_state::read_write_lock_state_enum state();
-
-private:
-
-    bool do_demote_to_read_lock_impl();
-
-    enum scheduling_reason
-    {
-        scheduling_reason_unlock,
-        scheduling_reason_timeout,
-        scheduling_reason_demote
-    };
-
-    void do_scheduling_impl(const scheduling_reason reason);
-    bool do_wake_one_reader(void);
-    bool do_wake_all_readers(void);
-    bool do_wake_writer(void);
-    bool waker_exists(void);
-};
-
-} // namespace detail
-
-} // namespace thread
-
-class BOOST_THREAD_DECL read_write_mutex : private noncopyable
-{
-public:
-
-    read_write_mutex(read_write_scheduling_policy::read_write_scheduling_policy_enum sp);
-    ~read_write_mutex();
-
-    read_write_scheduling_policy::read_write_scheduling_policy_enum policy() const { return m_impl.m_sp; }
-
-    friend class detail::thread::read_write_lock_ops<read_write_mutex>;
-
-    typedef detail::thread::scoped_read_write_lock<
-        read_write_mutex> scoped_read_write_lock;
-
-    typedef detail::thread::scoped_read_lock<
-        read_write_mutex> scoped_read_lock;
-
-    typedef detail::thread::scoped_write_lock<
-        read_write_mutex> scoped_write_lock;
-
-private:
-
-    // Operations that will eventually be done only
-    //   via lock types
-    void do_write_lock();
-    void do_read_lock();
-    void do_write_unlock();
-    void do_read_unlock();
-
-    void do_demote_to_read_lock();
-
-    void do_promote_to_write_lock();
-
-    bool locked();
-    read_write_lock_state::read_write_lock_state_enum state();
-
-    detail::thread::read_write_mutex_impl<mutex> m_impl; 
-};
-
-class BOOST_THREAD_DECL try_read_write_mutex : private noncopyable
-{
-public:
-
-    try_read_write_mutex(read_write_scheduling_policy::read_write_scheduling_policy_enum sp);
-    ~try_read_write_mutex();
-
-    read_write_scheduling_policy::read_write_scheduling_policy_enum policy() const { return m_impl.m_sp; }
-
-    friend class detail::thread::read_write_lock_ops<try_read_write_mutex>;
-
-    typedef detail::thread::scoped_read_write_lock<
-        try_read_write_mutex> scoped_read_write_lock;
-    typedef detail::thread::scoped_try_read_write_lock<
-        try_read_write_mutex> scoped_try_read_write_lock;
-
-    typedef detail::thread::scoped_read_lock<
-        try_read_write_mutex> scoped_read_lock;
-    typedef detail::thread::scoped_try_read_lock<
-        try_read_write_mutex> scoped_try_read_lock;
-
-    typedef detail::thread::scoped_write_lock<
-        try_read_write_mutex> scoped_write_lock;
-    typedef detail::thread::scoped_try_write_lock<
-        try_read_write_mutex> scoped_try_write_lock;
-
-private:
-
-    // Operations that will eventually be done only
-    //   via lock types
-    void do_write_lock();
-    void do_read_lock();
-    void do_write_unlock();
-    void do_read_unlock();
-    bool do_try_write_lock();
-    bool do_try_read_lock();
-
-
-    void do_demote_to_read_lock();
-    bool do_try_demote_to_read_lock();
-
-    void do_promote_to_write_lock();
-    bool do_try_promote_to_write_lock();
-
-    bool locked();
-    read_write_lock_state::read_write_lock_state_enum state();
-
-    detail::thread::read_write_mutex_impl<try_mutex> m_impl; 
-};
-
-class BOOST_THREAD_DECL timed_read_write_mutex : private noncopyable
-{
-public:
-
-    timed_read_write_mutex(read_write_scheduling_policy::read_write_scheduling_policy_enum sp);
-    ~timed_read_write_mutex();
-
-    read_write_scheduling_policy::read_write_scheduling_policy_enum policy() const { return m_impl.m_sp; }
-
-    friend class detail::thread::read_write_lock_ops<timed_read_write_mutex>;
-
-    typedef detail::thread::scoped_read_write_lock<
-        timed_read_write_mutex> scoped_read_write_lock;
-    typedef detail::thread::scoped_try_read_write_lock<
-        timed_read_write_mutex> scoped_try_read_write_lock;
-    typedef detail::thread::scoped_timed_read_write_lock<
-        timed_read_write_mutex> scoped_timed_read_write_lock;
-
-    typedef detail::thread::scoped_read_lock<
-        timed_read_write_mutex> scoped_read_lock;
-    typedef detail::thread::scoped_try_read_lock<
-        timed_read_write_mutex> scoped_try_read_lock;
-    typedef detail::thread::scoped_timed_read_lock<
-        timed_read_write_mutex> scoped_timed_read_lock;
-
-    typedef detail::thread::scoped_write_lock<
-        timed_read_write_mutex> scoped_write_lock;
-    typedef detail::thread::scoped_try_write_lock<
-        timed_read_write_mutex> scoped_try_write_lock;
-    typedef detail::thread::scoped_timed_write_lock<
-        timed_read_write_mutex> scoped_timed_write_lock;
-
-private:
-
-    // Operations that will eventually be done only
-    //   via lock types
-    void do_write_lock();
-    void do_read_lock();
-    void do_write_unlock();
-    void do_read_unlock();
-    bool do_try_write_lock();
-    bool do_try_read_lock();
-    bool do_timed_write_lock(const xtime &xt);
-    bool do_timed_read_lock(const xtime &xt);
-    
-    void do_demote_to_read_lock();
-    bool do_try_demote_to_read_lock();
-    bool do_timed_demote_to_read_lock(const xtime &xt);
-
-    void do_promote_to_write_lock();
-    bool do_try_promote_to_write_lock();
-    bool do_timed_promote_to_write_lock(const xtime &xt);
-
-    bool locked();
-    read_write_lock_state::read_write_lock_state_enum state();
-
-    detail::thread::read_write_mutex_impl<timed_mutex> m_impl; 
-};
-#ifdef BOOST_MSVC
-#   pragma warning(pop)
-#endif
-}    // namespace boost
-
-#endif
-
-// Change Log:
-//  10 Mar 02 
-//      Original version.
-//   4 May 04 GlassfordM
-//      Implement lock promotion and demotion.
-//      Add locked() and state() member functions for debugging
-//         (should these be made public?).
-//      Rename to improve consistency and eliminate abbreviations:
-//          Use "read" and "write" instead of "shared" and "exclusive".
-//          Change "rd" to "read", "wr" to "write", "rw" to "read_write".
-//      Add mutex_type typdef.
diff --git a/include/boost/thread/tss.hpp b/include/boost/thread/tss.hpp
index 164fa85e..0b33bda4 100644
--- a/include/boost/thread/tss.hpp
+++ b/include/boost/thread/tss.hpp
@@ -45,6 +45,7 @@ public:
             throw boost::thread_resource_error();
         }
     }
+
     ~tss();
     void* get() const;
     void set(void* value);
diff --git a/src/condition.cpp b/src/condition.cpp
index a0d07f7b..ffccad05 100644
--- a/src/condition.cpp
+++ b/src/condition.cpp
@@ -27,6 +27,12 @@
 #   include "mac/safe.hpp"
 #endif
 
+// The following include can be removed after the bug on QNX
+// has been tracked down. I need this only for debugging
+//#if !defined(NDEBUG) && defined(BOOST_HAS_PTHREADS)
+#include <iostream>
+//#endif
+
 namespace boost {
 
 namespace detail {
@@ -373,6 +379,20 @@ bool condition_impl::do_timed_wait(const xtime& xt, pthread_mutex_t* pmutex)
 
     int res = 0;
     res = pthread_cond_timedwait(&m_condition, pmutex, &ts);
+// Test code for QNX debugging, to get information during regressions
+#ifndef NDEBUG
+    if (res == EINVAL) {
+        boost::xtime now;
+        boost::xtime_get(&now, boost::TIME_UTC);
+        std::cerr << "now: " << now.sec << " " << now.nsec << std::endl;
+        std::cerr << "time: " << time(0) << std::endl;
+        std::cerr << "xtime: " << xt.sec << " " << xt.nsec << std::endl;
+        std::cerr << "ts: " << ts.tv_sec << " " << ts.tv_nsec << std::endl;
+        std::cerr << "pmutex: " << pmutex << std::endl;
+        std::cerr << "condition: " << &m_condition << std::endl;
+        assert(res != EINVAL);
+    }
+#endif    
     assert(res == 0 || res == ETIMEDOUT);
 
     return res != ETIMEDOUT;
diff --git a/src/mutex.inl b/src/mutex.inl
index 7540e3ed..0c3cc9a8 100644
--- a/src/mutex.inl
+++ b/src/mutex.inl
@@ -24,7 +24,15 @@ void init_TryEnterCriticalSection()
         version_info.dwMajorVersion >= 4)
     {
         if (HMODULE kernel_module = GetModuleHandle(TEXT("KERNEL32.DLL")))
-            g_TryEnterCriticalSection = reinterpret_cast<TryEnterCriticalSection_type>(GetProcAddress(kernel_module, TEXT("TryEnterCriticalSection")));
+        {
+            g_TryEnterCriticalSection = reinterpret_cast<TryEnterCriticalSection_type>(
+#if defined(BOOST_NO_ANSI_APIS)
+                GetProcAddressW(kernel_module, L"TryEnterCriticalSection")
+#else
+                GetProcAddress(kernel_module, "TryEnterCriticalSection")
+#endif        
+                );
+        }
     }
 }
 
@@ -62,9 +70,11 @@ inline void* new_critical_section()
 inline void* new_mutex(const char* name)
 {
 #if defined(BOOST_NO_ANSI_APIS)
-    int num_wide_chars = (strlen(name) + 1);
-    LPWSTR wide_name = (LPWSTR)_alloca( num_wide_chars * 2 );
-    ::MultiByteToWideChar(CP_ACP, 0, name, -1, wide_name, num_wide_chars);
+    int const num_wide_chars = ::MultiByteToWideChar(CP_ACP, 0, name, -1, 0, 0);
+    LPWSTR const wide_name = (LPWSTR)_alloca( (num_wide_chars+1) * 2 );
+    int const res=::MultiByteToWideChar(CP_ACP, 0, name, -1, wide_name, num_wide_chars);
+    if(!res)
+        throw boost::thread_resource_error();
     HANDLE mutex = CreateMutexW(0, 0, wide_name);
 #else
     HANDLE mutex = CreateMutexA(0, 0, name);
diff --git a/src/once.cpp b/src/once.cpp
index 7e7b06af..47634da4 100644
--- a/src/once.cpp
+++ b/src/once.cpp
@@ -1,5 +1,6 @@
 // Copyright (C) 2001-2003
 // William E. Kempf
+// Copyright (C) 2007 Anthony Williams
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying 
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -9,7 +10,6 @@
 #include <boost/detail/workaround.hpp>
 
 #include <boost/thread/once.hpp>
-#include <boost/thread/exceptions.hpp>
 #include <cstdio>
 #include <cassert>
 
@@ -19,7 +19,6 @@
       using std::size_t;
 #   endif
 #   include <windows.h>
-#   include "mutex.inl"
 #   if defined(BOOST_NO_STRINGSTREAM)
 #       include <strstream>
 
@@ -116,8 +115,11 @@ inline LONG ice_wrapper(LPVOID (__stdcall *ice)(LPVOID*, LPVOID, LPVOID),
 inline LONG compare_exchange(volatile LPLONG dest, LONG exch, LONG cmp)
 {
 #ifdef _WIN64
-    return InterlockedCompareExchange(dest, exch, cmp);
-#else
+    // Original patch from Anthony Williams.
+    // I (Roland Schwarz) am trying this for RC_1_34_0, since x64 regressions are
+    // currently not run on x64 platforms for HEAD
+    return InterlockedCompareExchange(dest, exch,cmp);
+#else    
     return ice_wrapper(&InterlockedCompareExchange, dest, exch, cmp);
 #endif
 }
@@ -139,7 +141,16 @@ void call_once(void (*func)(), once_flag& flag)
              << &flag 
              << std::ends;
         unfreezer unfreeze(strm);
-        HANDLE mutex=new_mutex(strm.str());
+#   if defined (BOOST_NO_ANSI_APIS)
+        int const num_wide_chars = ::MultiByteToWideChar(CP_ACP, 0, strm.str(), -1, 0, 0);
+        LPWSTR const wide_name = (LPWSTR)_alloca( (num_wide_chars+1) * 2 );
+        int const res=::MultiByteToWideChar(CP_ACP, 0, name, -1, wide_name, num_wide_chars);
+        if(!res)
+            throw boost::thread_resource_error();
+        HANDLE mutex = CreateMutexW(NULL, FALSE, wide_name);
+#   else
+        HANDLE mutex = CreateMutexA(NULL, FALSE, strm.str());
+#   endif
 #else
 #   if defined (BOOST_NO_ANSI_APIS)
         std::wostringstream strm;
diff --git a/src/read_write_mutex.cpp b/src/read_write_mutex.cpp
deleted file mode 100644
index 8a9dbba7..00000000
--- a/src/read_write_mutex.cpp
+++ /dev/null
@@ -1,1732 +0,0 @@
-// Copyright (C) 2002-2003
-// David Moore, William E. Kempf, Michael Glassford
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-/*
-PROBLEMS:
-
-The algorithms are not exception safe. For instance, if conditon::wait()
-or another call throws an exception, the lock state and other state data
-are not appropriately adjusted.
-
-A harder problem to fix is that, if a thread is killed while inside the
-read-write mutex functions (for example, while waiting),
-bad things happen.
-*/
-
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/assert.hpp>
-#include <boost/thread/read_write_mutex.hpp>
-#include <boost/thread/xtime.hpp>
-
-#include <boost/detail/workaround.hpp>
-
-#if !defined(BOOST_NO_STRINGSTREAM)
-#   include <sstream>
-#endif
-
-#ifdef BOOST_HAS_WINTHREADS
-#   include <windows.h>
-#   include <tchar.h>
-#   include <stdio.h>
-
-#   if !((_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400))
-        inline bool IsDebuggerPresent(void)
-        {
-            return false;
-        }
-#   endif
-#   if !defined(OutputDebugString)
-        inline void OutputDebugStringA(LPCSTR)
-        {}
-        inline void OutputDebugStringW(LPCWSTR)
-        {}
-        #define OutputDebugString(str)
-#   endif
-
-#   if defined(BOOST_READ_WRITE_MUTEX_USE_TRACE) && !defined(BOOST_NO_STRINGSTREAM)
-        inline void DoTrace(
-            const char* message,
-            int state,
-            int num_waiting_writers,
-            int num_waiting_readers,
-            bool state_waiting_promotion,
-            int num_waking_writers,
-            int num_waking_readers,
-            int num_max_waking_writers,
-            int num_max_waking_readers,
-            bool readers_next
-            )
-        {
-            std::ostringstream stream;
-            stream
-                << std::endl
-                << "***** "
-                << std::hex << GetCurrentThreadId() << std::dec << " "
-                << message << " "
-                << state << " "
-                << "["
-                << num_waiting_writers << " "
-                << num_waking_writers << " "
-                << num_max_waking_writers
-                << "] ["
-                << num_waiting_readers << " "
-                << num_waking_readers << " "
-                << num_max_waking_readers
-                << "]" << " "
-                << state_waiting_promotion << " "
-                << readers_next
-                << std::endl;
-            ::OutputDebugStringA(stream.str().c_str());
-        }
-
-#       define BOOST_READ_WRITE_MUTEX_TRACE(message) \
-            DoTrace(                                 \
-                message,                             \
-                m_state,                             \
-                m_num_waiting_writers,               \
-                m_num_waiting_readers,               \
-                m_state_waiting_promotion,           \
-                m_num_waking_writers,                \
-                m_num_waking_readers,                \
-                m_num_max_waking_writers,            \
-                m_num_max_waking_readers,            \
-                m_readers_next                       \
-                )
-#   endif
-#endif
-
-#if !defined(BOOST_READ_WRITE_MUTEX_TRACE)
-#   define BOOST_READ_WRITE_MUTEX_TRACE(message)
-#endif
-
-#if defined(BOOST_ASSERT)
-#   define BOOST_ASSERT_ELSE(expr) if ((BOOST_ASSERT(expr)), true)
-#else
-#   define BOOST_ASSERT_ELSE(expr) if (true)
-#endif
-
-//The following macro checks for invalid loop conditions
-//by checking for wait loops that loop more than once.
-//Please note that this does not necessarily indicate any
-//kind of error; there are several valid reasons for
-//a wait loop to loop more than once. For instance:
-//1) if a condition signals a spurious wakeup,
-//   it should wait again;
-//2) if a several waiting threads (e.g. readers) are 
-//   notified, and the first to wake changes conditions 
-//   so that the others should no longer wake (e.g.
-//   by promoting itself to a writer), the wait loops
-//   of the other threads, when they wake, will loop again
-//   and they will wait again.
-//For this reason, the BOOST_ASSERT_LOOP_COUNT is only
-//enabled when specifically requested by #defining
-//the BOOST_READ_WRITE_MUTEX_TEST_LOOP_COUNTS macro.
-
-#if defined(BOOST_READ_WRITE_MUTEX_TEST_LOOP_COUNTS)
-#   define BOOST_DEFINE_LOOP_COUNT int loop_count = 0;
-#   define BOOST_ASSERT_LOOP_COUNT() BOOST_ASSERT(++loop_count == 1)
-#else
-#   define BOOST_DEFINE_LOOP_COUNT do {} while(false);
-#   define BOOST_ASSERT_LOOP_COUNT() do {} while(false)
-#endif
-
-bool boost_error(char const* expr, char const* func, char const* file, long line)
-{
-    #if WINVER
-        using namespace std;
-
-        #ifndef ELEMENTS
-        #define ELEMENTS(a) (sizeof(a)/sizeof(*(a)))
-        #endif
-
-        TCHAR message[200];
-        _sntprintf(message,ELEMENTS(message),TEXT("Assertion failed (func=%s, file=%s, line=%d): %s"), func, file, line, expr);
-
-        ::OutputDebugString(message);
-
-        if(::IsDebuggerPresent())
-            ::DebugBreak();
-    #endif
-
-    return false;
-}
-
-namespace boost {
-namespace detail {
-namespace thread {
-
-//----------------------------------------
-    
-inline bool valid_lock_state(int state)
-{
-    return (state >= 0) || (state == -1);
-}
-
-inline bool valid_read_write_locked(int state)
-{
-    return state != 0;
-}
-
-inline bool valid_read_locked(int state)
-{
-    return state > 0;
-}
-
-inline bool valid_read_lockable(int state)
-{
-    return state >= 0;
-}
-
-inline bool valid_write_locked(int state)
-{
-    return state == -1;
-}
-
-inline bool valid_write_lockable(int state)
-{
-    return state == 0;
-}
-
-inline bool valid_promotable(int state)
-{
-    return state == 1;
-}
-
-inline bool valid_unlocked(int state)
-{
-    return state == 0;
-}
-
-//----------------------------------------
-
-class adjust_state
-{
-public:
-
-    adjust_state(bool& state, bool adjust = true)
-        : state_(state)
-        , adjust_(adjust)
-    {
-        if (adjust_)
-            state_ = true;
-    }
-
-    ~adjust_state(void)
-    {
-        adjust_now();
-    }
-
-    void set_adjust(bool adjust)
-    {
-        adjust_ = adjust;
-    }
-
-    void adjust_now(void)
-    {
-        if (adjust_)
-        {
-            BOOST_ASSERT(state_);
-            state_ = false;
-        }
-        else
-        {
-            BOOST_ASSERT(!state_);
-        }
-        adjust_ = false;
-    }
-
-private:
-
-    bool& state_;
-    bool adjust_;
-};
-
-//----------------------------------------
-
-class adjust_count
-{
-public:
-
-    adjust_count(int& count, bool adjust = true)
-        : count_(count)
-        , adjust_(adjust)
-    {
-        if (adjust_)
-            ++count_;
-    }
-
-    ~adjust_count(void)
-    {
-        adjust_now();
-    }
-
-    void set_adjust(bool adjust)
-    {
-        adjust_ = adjust;
-    }
-
-    void adjust_now(void)
-    {
-        if (adjust_)
-        {
-            BOOST_ASSERT(count_ > 0);
-            if (count_ > 0)
-                --count_;
-        }
-        else
-        {
-            BOOST_ASSERT(count_ >= 0);
-        }
-        adjust_ = false;
-    }
-
-private:
-
-    int& count_;
-    bool adjust_;
-};
-
-//----------------------------------------
-
-/*
-Because of the possibility that threads that call
-timed_wait may timeout instead of waking, even after
-they have been notified, the counters m_num_waking_writers
-and m_num_waking_readers cannot be exact, but rather keep
-track of the minimum number of writers and readers (respectively)
-that are waking. For this reason, adjust_count may decrement
-too many times. The max_count mechanism is an attempt to
-keep track of the maximum as well.
-*/
-
-class adjust_dual_count
-{
-public:
-
-    adjust_dual_count(int& count, int& max_count, bool adjust = true)
-        : count_(count)
-        , max_count_(max_count)
-        , adjust_(adjust)
-    {
-        BOOST_ASSERT(&max_count_ != &count_);
-        BOOST_ASSERT(max_count_ >= count_);
-
-        if (adjust_)
-        {
-            ++count_;
-            ++max_count_;
-        }
-    }
-
-    ~adjust_dual_count(void)
-    {
-        adjust_now();
-    }
-
-    void set_adjust(bool adjust)
-    {
-        adjust_ = adjust;
-    }
-
-    void adjust_now(void)
-    {
-        BOOST_ASSERT(max_count_ >= count_);
-
-        if (adjust_)
-        {
-            BOOST_ASSERT(max_count_ > 0);
-            if (count_ > 0)
-                --count_;
-            if (max_count_ > 0)
-                --max_count_;
-        }
-        else
-        {
-            BOOST_ASSERT(max_count_ >= 0);
-        }
-        adjust_ = false;
-    }
-
-private:
-
-    int& count_;
-    int& max_count_;
-    bool adjust_;
-};
-
-//----------------------------------------
-
-template<typename Mutex>
-read_write_mutex_impl<Mutex>::read_write_mutex_impl(read_write_scheduling_policy::read_write_scheduling_policy_enum sp)
-    : m_sp(sp)
-    , m_state(0)
-    , m_num_waiting_writers(0)
-    , m_num_waiting_readers(0)
-    , m_state_waiting_promotion(false)
-    , m_num_waking_writers(0)
-    , m_num_waking_readers(0)
-    , m_num_max_waking_writers(0)
-    , m_num_max_waking_readers(0)
-    , m_readers_next(true) 
-{}
-
-#if !BOOST_WORKAROUND(__BORLANDC__, <= 0x564)
-template<typename Mutex>
-read_write_mutex_impl<Mutex>::~read_write_mutex_impl()
-{
-    BOOST_ASSERT(valid_unlocked(m_state));
-    
-    BOOST_ASSERT(m_num_waiting_writers == 0);
-    BOOST_ASSERT(m_num_waiting_readers == 0);
-    BOOST_ASSERT(!m_state_waiting_promotion);
-
-    BOOST_ASSERT(m_num_waking_writers == 0);
-    BOOST_ASSERT(m_num_max_waking_writers == 0);
-    BOOST_ASSERT(m_num_waking_readers == 0);
-    BOOST_ASSERT(m_num_max_waking_readers == 0);
-}
-#endif
-
-template<typename Mutex>
-void read_write_mutex_impl<Mutex>::do_read_lock()
-{
-    typename Mutex::scoped_lock l(m_prot);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_read_lock() enter");
-    BOOST_ASSERT(valid_lock_state(m_state));
-
-    if (m_sp == read_write_scheduling_policy::reader_priority)
-    {
-        //Reader priority: wait while write-locked
-
-        BOOST_DEFINE_LOOP_COUNT;
-        adjust_dual_count adjust_waking(m_num_waking_readers, m_num_max_waking_readers, false);
-        while (m_state == -1)
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_readers);
-            adjust_waking.set_adjust(true);
-            m_waiting_readers.wait(l);
-        };
-    }
-    else if (m_sp == read_write_scheduling_policy::writer_priority)
-    {
-        //Writer priority: wait while write-locked or while writers are waiting
-
-        BOOST_DEFINE_LOOP_COUNT;
-        adjust_dual_count adjust_waking(m_num_waking_readers, m_num_max_waking_readers, false);
-//:     if (m_num_waiting_writers > 0 && m_num_waking_writers == 0)
-//:         do_wake_one_writer();
-        while (m_state == -1 || (m_num_waking_writers > 0) || (m_num_waiting_writers > 0 && waker_exists()))
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_readers);
-            adjust_waking.set_adjust(true);
-            m_waiting_readers.wait(l);
-        }
-    }
-    else BOOST_ASSERT_ELSE(m_sp == read_write_scheduling_policy::alternating_single_read || m_sp == read_write_scheduling_policy::alternating_many_reads)
-    {
-        //Alternating priority: wait while write-locked or while not readers' turn
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_readers, m_num_max_waking_readers, false);
-        while (m_state == -1 || (m_num_waiting_writers > 0 && m_num_waking_readers == 0 && waker_exists()))
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_readers);
-            adjust_waking.set_adjust(true);
-            m_waiting_readers.wait(l);
-        }
-    }
-
-    //Obtain a read lock
-
-    BOOST_ASSERT(valid_read_lockable(m_state));
-    ++m_state;
-
-    /*
-    Set m_readers_next in the lock function rather than the 
-    unlock function to prevent thread starvation that can happen,
-    e.g., like this: if all writer threads demote themselves
-    to reader threads before unlocking, they will unlock using 
-    do_read_unlock() which will set m_readers_next = false;
-    if there are enough writer threads, this will prevent any
-    "true" reader threads from ever obtaining the lock.
-    */
-
-    m_readers_next = false;
-
-    BOOST_ASSERT(valid_read_locked(m_state));
-    BOOST_READ_WRITE_MUTEX_TRACE("do_read_lock() exit");
-}
-
-template<typename Mutex>
-void read_write_mutex_impl<Mutex>::do_write_lock()
-{
-    typename Mutex::scoped_lock l(m_prot);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_write_lock() enter");
-    BOOST_ASSERT(valid_lock_state(m_state));
-
-    if (m_sp == read_write_scheduling_policy::reader_priority)
-    {
-        //Reader priority: wait while locked or while readers are waiting
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_writers, m_num_max_waking_writers, false);
-//:     if (m_num_waiting_readers > 0 && m_num_waking_readers == 0)
-//:         do_wake_all_readers();
-        while (m_state != 0 || (m_num_waking_readers > 0) || (m_num_waiting_readers > 0 && waker_exists()))
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_writers);
-            adjust_waking.set_adjust(true);
-            m_waiting_writers.wait(l);
-        }
-    }
-    else if (m_sp == read_write_scheduling_policy::writer_priority)
-    {
-        //Writer priority: wait while locked
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_writers, m_num_max_waking_writers, false);
-        while (m_state != 0)
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_writers);
-            adjust_waking.set_adjust(true);
-            m_waiting_writers.wait(l);
-        }
-    }
-    else BOOST_ASSERT_ELSE(m_sp == read_write_scheduling_policy::alternating_single_read || m_sp == read_write_scheduling_policy::alternating_many_reads)
-    {
-        //Shut down extra readers that were scheduled only because of no waiting writers
-
-        if (m_sp == read_write_scheduling_policy::alternating_single_read && m_num_waiting_writers == 0)
-            m_num_waking_readers = (m_readers_next && m_num_waking_readers > 0) ? 1 : 0;
-
-        //Alternating priority: wait while locked or while not writers' turn
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_writers, m_num_max_waking_writers, false);
-        while (m_state != 0 || (m_num_waking_readers > 0 && waker_exists()))
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_writers);
-            adjust_waking.set_adjust(true);
-            m_waiting_writers.wait(l);
-        }
-    }
-
-    //Obtain a write lock
-
-    BOOST_ASSERT(valid_write_lockable(m_state));
-    m_state = -1;
-
-    //See note in read_write_mutex_impl<>::do_read_lock() as to why 
-    //m_readers_next should be set here
-
-    m_readers_next = true;
-
-    BOOST_ASSERT(valid_write_locked(m_state));
-    BOOST_READ_WRITE_MUTEX_TRACE("do_write_lock() exit");
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_try_read_lock()
-{
-    typename Mutex::scoped_try_lock l(m_prot);
-    BOOST_ASSERT(valid_lock_state(m_state));
-    BOOST_READ_WRITE_MUTEX_TRACE("do_try_read_lock() enter");
-
-    if (!l.locked())
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_try_read_lock() exit 1");
-        return false;
-    }
-
-    bool fail;
-
-    if (m_sp == read_write_scheduling_policy::reader_priority)
-    {
-        //Reader priority: fail if write-locked
-        fail = (m_state == -1);
-    }
-    else if (m_sp == read_write_scheduling_policy::writer_priority)
-    {
-        //Writer priority: fail if write-locked or if writers are waiting
-        fail = (m_state == -1 || m_num_waiting_writers > 0);
-    }
-    else BOOST_ASSERT_ELSE(m_sp == read_write_scheduling_policy::alternating_single_read || m_sp == read_write_scheduling_policy::alternating_many_reads)
-    {
-        //Alternating priority: fail if write-locked or if not readers' turn
-        fail = (m_state == -1 || (m_num_waiting_writers > 0 && m_num_waking_readers == 0));
-    }
-
-    if (!fail)
-    {
-        //Obtain a read lock
-
-        BOOST_ASSERT(valid_read_lockable(m_state));
-        ++m_state;
-
-        //See note in read_write_mutex_impl<>::do_read_lock() as to why 
-        //m_readers_next should be set here
-
-        m_readers_next = false;
-
-        BOOST_ASSERT(valid_read_locked(m_state));
-            //Should be read-locked
-    }
-    else
-    {
-        BOOST_ASSERT(valid_write_locked(m_state) || m_num_waiting_writers > 0);
-            //Should be write-locked or
-            //writer should be waiting
-    }
-
-    BOOST_READ_WRITE_MUTEX_TRACE("do_try_read_lock() exit 2");
-    return !fail;
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_try_write_lock()
-{
-    typename Mutex::scoped_try_lock l(m_prot);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_try_write_lock() enter");
-    BOOST_ASSERT(valid_lock_state(m_state));
-
-    if (!l.locked())
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_try_write_lock() exit 1");
-        return false;
-    }
-
-    bool fail;
-
-    if (m_sp == read_write_scheduling_policy::reader_priority)
-    {
-        //Reader priority: fail if locked or if readers are waiting
-        fail = (m_state != 0 || m_num_waiting_readers > 0);
-    }
-    else if (m_sp == read_write_scheduling_policy::writer_priority)
-    {
-        //Writer priority: fail if locked
-        fail = (m_state != 0);
-    }
-    else BOOST_ASSERT_ELSE(m_sp == read_write_scheduling_policy::alternating_single_read || m_sp == read_write_scheduling_policy::alternating_many_reads)
-    {
-        //Alternating priority: fail if locked or if not writers' turn
-        fail = (m_state != 0 || m_num_waking_readers > 0);
-    }
-
-    if (!fail)
-    {
-        //Obtain a write lock
-
-        BOOST_ASSERT(valid_write_lockable(m_state));
-        m_state = -1;
-
-        //See note in read_write_mutex_impl<>::do_read_lock() as to why 
-        //m_readers_next should be set here
-
-        m_readers_next = true;
-
-        BOOST_ASSERT(valid_write_locked(m_state));
-            //Should be write-locked
-    }
-    else
-    {
-        BOOST_ASSERT(valid_read_write_locked(m_state) || m_num_waiting_readers > 0);
-            //Should be read-locked or write-locked, or
-            //reader should be waiting
-    }
-
-    BOOST_READ_WRITE_MUTEX_TRACE("do_try_write_lock() exit 2");
-    return !fail;
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_timed_read_lock(const boost::xtime &xt)
-{
-    typename Mutex::scoped_timed_lock l(m_prot, xt);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_timed_read_lock() enter");
-    BOOST_ASSERT(valid_lock_state(m_state));
-
-    if (!l.locked())
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_timed_read_lock() exit 1");
-        return false;
-    }
-
-    bool fail = false;
-
-    if (m_sp == read_write_scheduling_policy::reader_priority)
-    {
-        //Reader priority: wait while write-locked
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_readers, m_num_max_waking_readers, false);
-        while (m_state == -1)
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_readers);
-            adjust_waking.set_adjust(true);
-            if (!m_waiting_readers.timed_wait(l, xt))
-            {
-                ++m_num_max_waking_readers;
-                fail = true; 
-                break;
-            }
-        }
-    }
-    else if (m_sp == read_write_scheduling_policy::writer_priority)
-    {
-        //Writer priority: wait while write-locked or while writers are waiting
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_readers, m_num_max_waking_readers, false);
-//:     if (m_num_waiting_writers > 0 && m_num_waking_writers == 0)
-//:         do_wake_one_writer();
-        while (m_state == -1 || (m_num_waking_writers > 0) || (m_num_waiting_writers > 0 && waker_exists()))
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_readers);
-            adjust_waking.set_adjust(true);
-            if (!m_waiting_readers.timed_wait(l, xt))
-            {
-                ++m_num_max_waking_readers;
-                fail = true; 
-                break;
-            }
-        }
-    }
-    else BOOST_ASSERT_ELSE(m_sp == read_write_scheduling_policy::alternating_single_read || m_sp == read_write_scheduling_policy::alternating_many_reads)
-    {
-        //Alternating priority: wait while write-locked or while not readers' turn
-
-        BOOST_DEFINE_LOOP_COUNT
-        while (m_state == -1 || (m_num_waiting_writers > 0 && m_num_waking_readers == 0 && waker_exists()))
-        {
-            adjust_dual_count adjust_waking(m_num_waking_readers, m_num_max_waking_readers, false);
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_readers);
-            adjust_waking.set_adjust(true);
-            if (!m_waiting_readers.timed_wait(l, xt))
-            {
-                ++m_num_max_waking_readers;
-                fail = true; 
-                break;
-            }
-        }
-    }
-
-    if (!fail)
-    {
-        //Obtain a read lock
-
-        BOOST_ASSERT(valid_read_lockable(m_state));
-        ++m_state;
-
-        //See note in read_write_mutex_impl<>::do_read_lock() as to why 
-        //m_readers_next should be set here
-
-        m_readers_next = false;
-
-        BOOST_ASSERT(valid_read_locked(m_state));
-            //Should be read-locked
-    }
-    else
-    {
-        //In case there is no thread with a lock that will 
-        //call do_scheduling_impl() when it unlocks, call it ourselves
-        do_scheduling_impl(scheduling_reason_timeout);
-    }
-
-    BOOST_READ_WRITE_MUTEX_TRACE("do_timed_read_lock() exit 2");
-    return !fail;
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_timed_write_lock(const boost::xtime &xt)
-{
-    typename Mutex::scoped_timed_lock l(m_prot, xt);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_timed_write_lock() enter");
-    BOOST_ASSERT(valid_lock_state(m_state));
-
-    if (!l.locked())
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_timed_write_lock() exit 1");
-        return false;
-    }
-
-    bool fail = false;
-
-    if (m_sp == read_write_scheduling_policy::reader_priority)
-    {
-        //Reader priority: wait while locked or while readers are waiting
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_writers, m_num_max_waking_writers, false);
-//:     if (m_num_waiting_readers > 0 && m_num_waking_readers == 0)
-//:         do_wake_all_readers();
-        while (m_state != 0 || (m_num_waking_readers > 0) || (m_num_waiting_readers > 0 && waker_exists()))
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_writers);
-            adjust_waking.set_adjust(true);
-            if (!m_waiting_writers.timed_wait(l, xt))
-            {
-                ++m_num_max_waking_writers;
-                fail = true;
-                break;
-            }
-        }
-    }
-    else if (m_sp == read_write_scheduling_policy::writer_priority)
-    {
-        //Writer priority: wait while locked
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_writers, m_num_max_waking_writers, false);
-        while (m_state != 0)
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_writers);
-            adjust_waking.set_adjust(true);
-            if (!m_waiting_writers.timed_wait(l, xt))
-            {
-                ++m_num_max_waking_writers;
-                fail = true;
-                break;
-            }
-        }
-    }
-    else BOOST_ASSERT_ELSE(m_sp == read_write_scheduling_policy::alternating_single_read || m_sp == read_write_scheduling_policy::alternating_many_reads)
-    {
-        //Shut down extra readers that were scheduled only because of no waiting writers
-
-        if (m_sp == read_write_scheduling_policy::alternating_single_read && m_num_waiting_writers == 0)
-            m_num_waking_readers = (m_readers_next && m_num_waking_readers > 0) ? 1 : 0;
-
-        //Alternating priority: wait while locked or while not writers' turn
-
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_writers, m_num_max_waking_writers, false);
-        while (m_state != 0 || (m_num_waking_readers > 0 && waker_exists()))
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_writers);
-            adjust_waking.set_adjust(true);
-            if (!m_waiting_writers.timed_wait(l, xt))
-            {
-                ++m_num_max_waking_writers;
-                fail = true;
-                break;
-            }
-        }
-    }
-
-    if (!fail)
-    {
-        //Obtain a write lock
-
-        BOOST_ASSERT(valid_write_lockable(m_state));
-        m_state = -1;
-
-        //See note in read_write_mutex_impl<>::do_read_lock() as to why 
-        //m_readers_next should be set here
-
-        m_readers_next = true;
-
-        BOOST_ASSERT(valid_write_locked(m_state));
-            //Should be write-locked
-    }
-    else
-    {
-        //In case there is no thread with a lock that will 
-        //call do_scheduling_impl() when it unlocks, call it ourselves
-        do_scheduling_impl(scheduling_reason_timeout);
-    }
-
-    BOOST_READ_WRITE_MUTEX_TRACE("do_timed_write_lock() exit 2");
-    return !fail;
-}
-
-template<typename Mutex>
-void read_write_mutex_impl<Mutex>::do_read_unlock()
-{
-    typename Mutex::scoped_lock l(m_prot);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_read_unlock() enter");
-    BOOST_ASSERT(valid_read_locked(m_state));
-
-    if (m_state > 0)
-        --m_state;
-    else //not read-locked
-        throw lock_error();
-
-    do_scheduling_impl(scheduling_reason_unlock);
-
-    BOOST_ASSERT(valid_read_locked(m_state) || valid_unlocked(m_state));
-    BOOST_READ_WRITE_MUTEX_TRACE("do_read_unlock() exit");
-}
-
-template<typename Mutex>
-void read_write_mutex_impl<Mutex>::do_write_unlock()
-{
-    typename Mutex::scoped_lock l(m_prot);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_write_unlock() enter");
-    BOOST_ASSERT(valid_write_locked(m_state));
-
-    if (m_state == -1)
-        m_state = 0;
-    else BOOST_ASSERT_ELSE(m_state >= 0)
-        throw lock_error();      // Trying to release a reader-locked or unlocked mutex???
-
-    do_scheduling_impl(scheduling_reason_unlock);
-
-    BOOST_ASSERT(valid_unlocked(m_state));
-    BOOST_READ_WRITE_MUTEX_TRACE("do_write_unlock() exit");
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_demote_to_read_lock_impl()
-{
-    BOOST_READ_WRITE_MUTEX_TRACE("do_demote_to_read_lock_impl() enter");
-    BOOST_ASSERT(valid_write_locked(m_state));
-
-    if (m_state == -1) 
-    {
-        //Convert from write lock to read lock
-        m_state = 1;
-
-        //If the conditions are right, release other readers
-
-        do_scheduling_impl(scheduling_reason_demote);
-
-        //Lock demoted
-        BOOST_ASSERT(valid_read_locked(m_state));
-        BOOST_READ_WRITE_MUTEX_TRACE("do_demote_to_read_lock_impl() exit 1");
-        return true;
-    }
-    else BOOST_ASSERT_ELSE(m_state >= 0)
-    {
-        //Lock is read-locked or unlocked can't be demoted
-        BOOST_READ_WRITE_MUTEX_TRACE("do_demote_to_read_lock_impl() exit 2");
-        throw lock_error();
-        return false;
-    }
-    return false; //Eliminate warnings on some compilers
-}
-
-template<typename Mutex>
-void read_write_mutex_impl<Mutex>::do_demote_to_read_lock()
-{
-    typename Mutex::scoped_lock l(m_prot);
-    BOOST_ASSERT(valid_write_locked(m_state));
-
-    do_demote_to_read_lock_impl();
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_try_demote_to_read_lock()
-{
-    typename Mutex::scoped_try_lock l(m_prot);
-    BOOST_ASSERT(valid_write_locked(m_state));
-
-    if (!l.locked())
-        return false;
-    else //(l.locked())
-        return do_demote_to_read_lock_impl();
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_timed_demote_to_read_lock(const boost::xtime &xt)
-{
-    typename Mutex::scoped_timed_lock l(m_prot, xt);
-    BOOST_ASSERT(valid_write_locked(m_state));
-
-    if (!l.locked())
-        return false;
-    else //(l.locked())
-        return do_demote_to_read_lock_impl();
-}
-
-template<typename Mutex>
-void read_write_mutex_impl<Mutex>::do_promote_to_write_lock()
-{
-    typename Mutex::scoped_lock l(m_prot);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_promote_to_write_lock() enter");
-    BOOST_ASSERT(valid_read_locked(m_state));
-
-    if (m_state == 1)
-    {
-        //Convert from read lock to write lock
-        m_state = -1;
-
-        //Lock promoted
-        BOOST_ASSERT(valid_write_locked(m_state));
-    }
-    else if (m_state <= 0)
-    {
-        //Lock is write-locked or unlocked can't be promoted
-        throw lock_error();
-    }
-    else if (m_state_waiting_promotion)
-    {
-        //Someone else is already trying to promote. Avoid deadlock by throwing exception.
-        throw lock_error();
-    }
-    else BOOST_ASSERT_ELSE(m_state > 1 && !m_state_waiting_promotion)
-    {
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_writers, m_num_max_waking_writers, false);
-        while (m_state > 1)
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_writers);
-            adjust_state adjust_waiting_promotion(m_state_waiting_promotion);
-            adjust_waking.set_adjust(true);
-            m_waiting_promotion.wait(l);
-        }
-
-        BOOST_ASSERT(m_num_waiting_writers >= 0);
-        BOOST_ASSERT(valid_promotable(m_state));
-
-        //Convert from read lock to write lock
-        m_state = -1;
-        
-        //Lock promoted
-        BOOST_ASSERT(valid_write_locked(m_state));
-    }
-    BOOST_READ_WRITE_MUTEX_TRACE("do_promote_to_write_lock() exit");
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_try_promote_to_write_lock()
-{
-    typename Mutex::scoped_try_lock l(m_prot);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_try_promote_to_write_lock() enter");
-    BOOST_ASSERT(valid_read_locked(m_state));
-
-    bool result;
-
-    if (!l.locked())
-        result = false;
-    else
-    {
-        if (m_state == 1)
-        {
-            //Convert from read lock to write lock
-            m_state = -1;
-
-            //Lock promoted
-            BOOST_ASSERT(valid_write_locked(m_state));
-            result = true;
-        }
-        else if (m_state <= 0)
-        {
-            //Lock is write-locked or unlocked can't be promoted
-            result = false;
-        }
-        else if (m_state_waiting_promotion)
-        {
-            //Someone else is already trying to promote. Avoid deadlock by returning false.
-            result = false;
-        }
-        else BOOST_ASSERT_ELSE(m_state > 1 && !m_state_waiting_promotion)
-        {
-            //There are other readers, so we can't promote
-            result = false;
-        }
-    }
-
-    BOOST_READ_WRITE_MUTEX_TRACE("do_try_promote_to_write_lock() exit");
-    return result;
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_timed_promote_to_write_lock(const boost::xtime &xt)
-{
-    typename Mutex::scoped_timed_lock l(m_prot, xt);
-    BOOST_READ_WRITE_MUTEX_TRACE("do_timed_promote_to_write_lock() enter");
-    BOOST_ASSERT(valid_read_locked(m_state));
-
-    if (!l.locked())
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_timed_promote_to_write_lock( exit 1");
-        return false;
-    }
-
-    bool fail = false;
-
-    if (m_state == 1)
-    {
-        fail = false;
-    }
-    else if (m_state <= 0)
-    {
-        //Lock is not read-locked and can't be promoted
-        fail = true;
-    }
-    else if (m_state_waiting_promotion)
-    {
-        //Someone else is already trying to promote. Avoid deadlock by returning false.
-        fail = true;
-    }
-    else BOOST_ASSERT_ELSE(m_state > 1 && !m_state_waiting_promotion)
-    {   
-        BOOST_DEFINE_LOOP_COUNT
-        adjust_dual_count adjust_waking(m_num_waking_writers, m_num_max_waking_writers, false);
-        while (m_state > 1)
-        {
-            BOOST_ASSERT_LOOP_COUNT(); //See note at BOOST_ASSERT_LOOP_COUNT definition above
-            BOOST_ASSERT(waker_exists()); //There should be someone to wake us up
-            adjust_count adjust_waiting(m_num_waiting_writers);
-            adjust_state adjust_waiting_promotion(m_state_waiting_promotion);
-            adjust_waking.set_adjust(true);
-            if (!m_waiting_promotion.timed_wait(l, xt))
-            {
-                ++m_num_max_waking_writers;
-                fail = true;
-                break;
-            }
-        }
-    }
-
-    if (!fail)
-    {
-        //Convert from read lock to write lock
-
-        BOOST_ASSERT(m_num_waiting_writers >= 0);
-        BOOST_ASSERT(valid_promotable(m_state));
-
-        m_state = -1;
-        
-        //Lock promoted
-
-        BOOST_ASSERT(valid_write_locked(m_state));
-    }
-    else
-    {
-        //In case there is no thread with a lock that will 
-        //call do_scheduling_impl() when it unlocks, call it ourselves
-        do_scheduling_impl(scheduling_reason_timeout);
-    }
-
-    BOOST_READ_WRITE_MUTEX_TRACE("do_timed_promote_to_write_lock( exit 2");
-    return !fail;
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::locked()
-{
-    int state = m_state;
-    BOOST_ASSERT(valid_lock_state(state));
-
-    return state != 0;
-}
-
-template<typename Mutex>
-read_write_lock_state::read_write_lock_state_enum read_write_mutex_impl<Mutex>::state()
-{
-    int state = m_state;
-    BOOST_ASSERT(valid_lock_state(state));
-
-    if (state > 0)
-    {
-        BOOST_ASSERT(valid_read_locked(state));
-        return read_write_lock_state::read_locked;
-    }
-    else if (state == -1)
-    {
-        BOOST_ASSERT(valid_write_locked(state));
-        return read_write_lock_state::write_locked;
-    }
-    else BOOST_ASSERT_ELSE(state == 0)
-        return read_write_lock_state::unlocked;
-    return read_write_lock_state::unlocked; //Eliminate warnings on some compilers
-}
-
-template<typename Mutex>
-void read_write_mutex_impl<Mutex>::do_scheduling_impl(const scheduling_reason reason)
-{
-    switch(reason)
-    {
-        case scheduling_reason_unlock:
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl(): scheduling_reason_unlock");
-
-            //A thread just unlocked, so there can be no existing write lock.
-            //There may still be read locks, however.
-
-            BOOST_ASSERT(valid_read_locked(m_state) || valid_unlocked(m_state));
-
-            if (m_state_waiting_promotion)
-            {
-                //If a thread is waiting for promotion,
-                //it must have a read lock.
-
-                BOOST_ASSERT(valid_read_locked(m_state));
-            }
-        }
-        break;
-
-        case scheduling_reason_timeout:
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl(): scheduling_reason_timeout");
-
-            //A thread waiting for a lock just timed out, so the
-            //lock could be in any state (read locked, write locked, unlocked).
-
-            BOOST_ASSERT(valid_lock_state(m_state));
-
-            if (m_state_waiting_promotion)
-            {
-                //If a thread is waiting for promotion,
-                //it must have a read lock.
-
-                BOOST_ASSERT(valid_read_locked(m_state));
-            }
-        }
-        break;
-
-        case scheduling_reason_demote:
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl(): scheduling_reason_demote");
-
-            //A write lock has just converted its state to a read lock;
-            //since a write-locked thread has an exclusive lock,
-            //and no other thread has yet been allowed to obtain
-            //a read lock, the state should indicate that there is 
-            //exactly one reader.
-
-            BOOST_ASSERT(m_state == 1);
-
-            //No thread should be waiting for promotion because to do
-            //so it would first have to obtain a read lock, which
-            //is impossible because this thread had a write lock.
-
-            BOOST_ASSERT(!m_state_waiting_promotion);
-        }
-        break;
-
-        default:
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl(): scheduling_reason_none");
-
-            throw lock_error();
-            return; //eliminate warnings on some compilers
-        }
-        break;
-    };
-
-    bool woken;
-
-    if (m_num_waiting_writers > 0 && m_num_waiting_readers > 0)
-    {
-        //Both readers and writers waiting: use scheduling policy
-
-        if (m_sp == read_write_scheduling_policy::reader_priority)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl() 1: writers & readers, reader_priority");
-            woken = do_wake_all_readers();
-            if (woken)
-                m_num_waking_writers = m_num_max_waking_writers = 0; //shut down any waking writers
-        }
-        else if (m_sp == read_write_scheduling_policy::writer_priority)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl(): writers & readers, writer_priority");
-            woken = do_wake_writer();
-            if (woken)
-                m_num_waking_readers  = m_num_max_waking_readers = 0; //shut down any waking readers
-        }
-        else if (m_sp == read_write_scheduling_policy::alternating_single_read)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl() 2: writers & readers, alternating_single_read");
-            if (m_readers_next)
-            {
-                if (m_num_waking_writers == 0)
-                    woken = do_wake_one_reader();
-                else
-                    woken = false;
-            }
-            else
-            {
-                if (m_num_waking_readers == 0)
-                    woken = do_wake_writer();
-                else
-                    woken = false;
-            }
-        }
-        else BOOST_ASSERT_ELSE(m_sp == read_write_scheduling_policy::alternating_many_reads)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl() 3: writers & readers, alternating_many_reads");
-            if (m_readers_next)
-            {
-                if (m_num_waking_writers == 0)
-                    woken = do_wake_all_readers();
-                else
-                    woken = false;
-            }
-            else
-            {
-                if (m_num_waking_readers == 0)
-                    woken = do_wake_writer();
-                else
-                    woken = false;
-            }
-        }
-    }
-    else if (m_num_waiting_writers > 0)
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl() 4: writers only");
-        //Only writers waiting--scheduling policy doesn't matter
-        woken = do_wake_writer();
-    }
-    else if (m_num_waiting_readers > 0)
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl() 5: readers only");
-        //Only readers waiting--scheduling policy doesn't matter    
-        woken = do_wake_all_readers();
-    }
-    else
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_scheduling_impl() 6: no writers or readers");
-        woken = false;
-    }
-
-    BOOST_ASSERT(
-        woken 
-        || (m_state == -1) || (m_state > (m_state_waiting_promotion ? 1 : 0))
-        || (m_num_waking_writers + m_num_waking_readers > 0)
-        || (m_num_waiting_writers + m_num_waiting_readers == 0)
-        );
-        //Ensure that we woke a thread,
-        //that another besides the current thread is already awake to wake others when it's done, 
-        //that another besides the current thread will wake and can wake others when it's done,
-        //or that no other threads are waiting and so none remain to be woken
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_wake_one_reader(void)
-{
-    if (m_state == -1)
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_wake_one_reader() 1: don't wake, write locked");
-
-        //If write-locked, don't bother waking a reader
-    }
-    else if (m_num_waking_readers > 0)
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_wake_one_reader() 2: don't wake, nothing to wake");
-
-        //If a reader is already waking,
-        //don't bother waking another
-        //(since we only want one)
-    }
-    else if (m_num_waiting_readers > 0)
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_wake_one_reader() 3: wake");
-
-        //Wake a reader
-        BOOST_ASSERT(valid_read_lockable(m_state));
-        m_num_waking_readers = m_num_max_waking_readers = 1;
-        m_waiting_readers.notify_one();
-        return true;
-    }
-    else
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_wake_one_reader() 4: don't wake, nothing to wake");
-    }
-
-    return false;
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_wake_all_readers(void)
-{
-    if (m_state == -1)
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_wake_all_readers() 1: don't wake, write locked");
-
-        //If write-locked, don't bother waking readers
-    }
-    else if (m_num_waiting_readers > 0)
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_wake_all_readers() 2: wake");
-
-        //Wake readers
-        BOOST_ASSERT(valid_read_lockable(m_state));
-        m_num_waking_readers = m_num_max_waking_readers = m_num_waiting_readers;
-        m_waiting_readers.notify_all();
-        return true;
-    }
-    else
-    {
-        BOOST_READ_WRITE_MUTEX_TRACE("do_wake_all_readers() 3: don't wake, nothing to wake");
-    }
-
-    return false;
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::do_wake_writer(void)
-{
-    if (m_state_waiting_promotion)
-    {
-        //If a reader is waiting for promotion, promote it
-        //(it holds a read lock until it is promoted,
-        //so it's not possible to wake a normal writer).
-
-        if (m_state == -1 || m_state > 1)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_wake_writer() 1: waiting promotion: don't wake, still locked");
-
-            //If write-locked, or if read-locked by
-            //readers other than the thread waiting
-            //for promotion, don't bother waking it
-        }
-        else if (m_num_waking_writers > 0)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_wake_writer() 2: waiting promotion: don't wake, writer already waking");
-
-            //If a writer is already waking,
-            //don't bother waking another
-            //(since only one at a time can wake anyway)
-        }
-        else if (m_num_waiting_writers > 0)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_wake_writer() 3: waiting promotion: wake");
-
-            //Wake the thread waiting for promotion
-            BOOST_ASSERT(valid_promotable(m_state));
-            m_num_waking_writers = m_num_max_waking_writers = 1;
-            m_waiting_promotion.notify_one();
-            return true;
-        }
-        else
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_wake_writer() 4: waiting promotion: don't wake, no writers to wake");
-        }
-    }
-    else
-    {
-        if (m_state != 0)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_wake_writer() 5: don't wake, still locked");
-
-            //If locked, don't bother waking a writer
-        }
-        else if (m_num_waking_writers > 0)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_wake_writer() 6: don't wake, writer already waking");
-
-            //If a writer is already waking,
-            //don't bother waking another
-            //(since only one at a time can wake anyway)
-        }
-        else if (m_num_waiting_writers > 0)
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_wake_writer() 7: wake");
-
-            //Wake a writer
-            BOOST_ASSERT(valid_write_lockable(m_state));
-            m_num_waking_writers = m_num_max_waking_writers = 1;
-            m_waiting_writers.notify_one();
-            return true;
-        }
-        else
-        {
-            BOOST_READ_WRITE_MUTEX_TRACE("do_wake_writer() 8: don't wake, no writers to wake");
-        }
-    }
-
-    return false;
-}
-
-template<typename Mutex>
-bool read_write_mutex_impl<Mutex>::waker_exists(void)
-{
-    //Is there a "live" thread (one that is awake or about to wake
-    //that will be able to wake up a thread about to go to sleep?
-    return valid_read_write_locked(m_state) || (m_num_waking_writers + m_num_waking_readers > 0);
-}
-
-    }   // namespace thread
-    }   // namespace detail
-
-read_write_mutex::read_write_mutex(read_write_scheduling_policy::read_write_scheduling_policy_enum sp)
-    : m_impl(sp)
-{}
-
-read_write_mutex::~read_write_mutex() 
-{}
-
-void read_write_mutex::do_read_lock()
-{
-    m_impl.do_read_lock();
-}
-
-void read_write_mutex::do_write_lock()
-{
-    m_impl.do_write_lock();
-}
-
-void read_write_mutex::do_read_unlock()
-{
-    m_impl.do_read_unlock();
-}
-
-void read_write_mutex::do_write_unlock()
-{
-    m_impl.do_write_unlock();
-}
-
-void read_write_mutex::do_demote_to_read_lock()
-{
-    m_impl.do_demote_to_read_lock();
-}
-
-void read_write_mutex::do_promote_to_write_lock()
-{
-    m_impl.do_promote_to_write_lock();
-}
-
-bool read_write_mutex::locked()
-{
-    return m_impl.locked();
-}
-
-read_write_lock_state::read_write_lock_state_enum read_write_mutex::state()
-{
-    return m_impl.state();
-}
-
-try_read_write_mutex::try_read_write_mutex(read_write_scheduling_policy::read_write_scheduling_policy_enum sp) 
-    : m_impl(sp)
-{}
-
-try_read_write_mutex::~try_read_write_mutex()
-{}
-
-void try_read_write_mutex::do_read_lock()
-{
-    m_impl.do_read_lock();
-}
-
-void try_read_write_mutex::do_write_lock()
-{
-    m_impl.do_write_lock();
-
-}
-
-void try_read_write_mutex::do_write_unlock()
-{
-    m_impl.do_write_unlock();
-}
-
-void try_read_write_mutex::do_read_unlock()
-{
-    m_impl.do_read_unlock();
-}
-
-bool try_read_write_mutex::do_try_read_lock()
-{
-    return m_impl.do_try_read_lock();
-}
-
-bool try_read_write_mutex::do_try_write_lock()
-{
-    return m_impl.do_try_write_lock();
-}
-
-void try_read_write_mutex::do_demote_to_read_lock()
-{
-    m_impl.do_demote_to_read_lock();
-}
-
-bool try_read_write_mutex::do_try_demote_to_read_lock()
-{
-    return m_impl.do_try_demote_to_read_lock();
-}
-
-void try_read_write_mutex::do_promote_to_write_lock()
-{
-    m_impl.do_promote_to_write_lock();
-}
-
-bool try_read_write_mutex::do_try_promote_to_write_lock()
-{
-    return m_impl.do_try_promote_to_write_lock();
-}
-
-bool try_read_write_mutex::locked()
-{
-    return m_impl.locked();
-}
-
-read_write_lock_state::read_write_lock_state_enum try_read_write_mutex::state()
-{
-    return m_impl.state();
-}
-
-timed_read_write_mutex::timed_read_write_mutex(read_write_scheduling_policy::read_write_scheduling_policy_enum sp) 
-    : m_impl(sp)
-{}
-
-timed_read_write_mutex::~timed_read_write_mutex()
-{}
-
-void timed_read_write_mutex::do_read_lock()
-{
-    m_impl.do_read_lock();
-}
-
-void timed_read_write_mutex::do_write_lock()
-{
-    m_impl.do_write_lock();
-
-}
-
-void timed_read_write_mutex::do_read_unlock()
-{
-    m_impl.do_read_unlock();
-}
-
-void timed_read_write_mutex::do_write_unlock()
-{
-    m_impl.do_write_unlock();
-}
-
-bool timed_read_write_mutex::do_try_read_lock()
-{
-    return m_impl.do_try_read_lock();
-}
-
-bool timed_read_write_mutex::do_try_write_lock()
-{
-    return m_impl.do_try_write_lock();
-}
-
-bool timed_read_write_mutex::do_timed_read_lock(const xtime &xt)
-{
-    return m_impl.do_timed_read_lock(xt);
-}
-
-bool timed_read_write_mutex::do_timed_write_lock(const xtime &xt)
-{
-    return m_impl.do_timed_write_lock(xt);
-}
-
-void timed_read_write_mutex::do_demote_to_read_lock()
-{
-    m_impl.do_demote_to_read_lock();
-}
-
-bool timed_read_write_mutex::do_try_demote_to_read_lock()
-{
-    return m_impl.do_try_demote_to_read_lock();
-}
-
-bool timed_read_write_mutex::do_timed_demote_to_read_lock(const xtime &xt)
-{
-    return m_impl.do_timed_demote_to_read_lock(xt);
-}
-
-void timed_read_write_mutex::do_promote_to_write_lock()
-{
-    m_impl.do_promote_to_write_lock();
-}
-
-bool timed_read_write_mutex::do_try_promote_to_write_lock()
-{
-    return m_impl.do_try_promote_to_write_lock();
-}
-
-bool timed_read_write_mutex::do_timed_promote_to_write_lock(const xtime &xt)
-{
-    return m_impl.do_timed_promote_to_write_lock(xt);
-}
-
-bool timed_read_write_mutex::locked()
-{
-    return m_impl.locked();
-}
-
-read_write_lock_state::read_write_lock_state_enum timed_read_write_mutex::state()
-{
-    return m_impl.state();
-}
-
-#if !defined(NDEBUG)
-    //Explicit instantiations of read/write locks to catch syntax errors in templates
-
-    template class boost::detail::thread::scoped_read_write_lock<read_write_mutex>;
-    template class boost::detail::thread::scoped_read_write_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_read_write_lock<timed_read_write_mutex>;
-
-    //template class boost::detail::thread::scoped_try_read_write_lock<read_write_mutex>;
-    template class boost::detail::thread::scoped_try_read_write_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_try_read_write_lock<timed_read_write_mutex>;
-
-    //template class boost::detail::thread::scoped_timed_read_write_lock<read_write_mutex>;
-    //template class boost::detail::thread::scoped_timed_read_write_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_timed_read_write_lock<timed_read_write_mutex>;
-
-    //Explicit instantiations of read locks to catch syntax errors in templates
-
-    template class boost::detail::thread::scoped_read_lock<read_write_mutex>;
-    template class boost::detail::thread::scoped_read_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_read_lock<timed_read_write_mutex>;
-
-    //template class boost::detail::thread::scoped_try_read_lock<read_write_mutex>;
-    template class boost::detail::thread::scoped_try_read_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_try_read_lock<timed_read_write_mutex>;
-
-    //template class boost::detail::thread::scoped_timed_read_lock<read_write_mutex>;
-    //template class boost::detail::thread::scoped_timed_read_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_timed_read_lock<timed_read_write_mutex>;
-
-    //Explicit instantiations of write locks to catch syntax errors in templates
-
-    template class boost::detail::thread::scoped_write_lock<read_write_mutex>;
-    template class boost::detail::thread::scoped_write_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_write_lock<timed_read_write_mutex>;
-
-    //template class boost::detail::thread::scoped_try_write_lock<read_write_mutex>;
-    template class boost::detail::thread::scoped_try_write_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_try_write_lock<timed_read_write_mutex>;
-
-    //template class boost::detail::thread::scoped_timed_write_lock<read_write_mutex>;
-    //template class boost::detail::thread::scoped_timed_write_lock<try_read_write_mutex>;
-    template class boost::detail::thread::scoped_timed_write_lock<timed_read_write_mutex>;
-#endif
-} // namespace boost
-
-// Change Log:
-//  10 Mar 02 
-//      Original version.
-//   4 May 04 GlassfordM
-//      For additional changes, see read_write_mutex.hpp.
-//      Add many assertions to test validity of mutex state and operations.
-//      Rework scheduling algorithm due to addition of lock promotion and 
-//         demotion.
-//      Add explicit template instantiations to catch syntax errors 
-//         in templates.
diff --git a/src/recursive_mutex.cpp b/src/recursive_mutex.cpp
index 50351502..ebe17c1a 100644
--- a/src/recursive_mutex.cpp
+++ b/src/recursive_mutex.cpp
@@ -291,7 +291,8 @@ recursive_mutex::recursive_mutex()
 
     res = pthread_mutex_init(&m_mutex, &attr);
     {
-        int res = pthread_mutexattr_destroy(&attr);
+        int res = 0;
+        res = pthread_mutexattr_destroy(&attr);
         assert(res == 0);
     }
     if (res != 0)
@@ -447,7 +448,8 @@ recursive_try_mutex::recursive_try_mutex()
 
     res = pthread_mutex_init(&m_mutex, &attr);
     {
-        int res = pthread_mutexattr_destroy(&attr);
+        int res = 0;
+        res = pthread_mutexattr_destroy(&attr);
         assert(res == 0);
     }
     if (res != 0)
diff --git a/src/thread.cpp b/src/thread.cpp
index 185f45f5..e96e5829 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -1,5 +1,6 @@
 // Copyright (C) 2001-2003
 // William E. Kempf
+// Copyright (C) 2007 Anthony Williams
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying 
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -89,18 +90,6 @@ public:
     bool m_started;
 };
 
-#if defined(BOOST_HAS_WINTHREADS)
-
-struct on_thread_exit_guard
-{
-    ~on_thread_exit_guard()
-    {
-        on_thread_exit();
-    }
-};
-
-#endif
-
 } // unnamed namespace
 
 extern "C" {
@@ -112,25 +101,13 @@ extern "C" {
         static OSStatus thread_proxy(void* param)
 #endif
     {
-//        try
-        {
+        thread_param* p = static_cast<thread_param*>(param);
+        boost::function0<void> threadfunc = p->m_threadfunc;
+        p->started();
+        threadfunc();
 #if defined(BOOST_HAS_WINTHREADS)
-
-            on_thread_exit_guard guard;
-
+        on_thread_exit();
 #endif
-
-            thread_param* p = static_cast<thread_param*>(param);
-            boost::function0<void> threadfunc = p->m_threadfunc;
-            p->started();
-            threadfunc();
-        }
-//        catch (...)
-//        {
-//#if defined(BOOST_HAS_WINTHREADS)
-//            on_thread_exit();
-//#endif
-//        }
 #if defined(BOOST_HAS_MPTASKS)
         ::boost::detail::thread_cleanup();
 #endif
diff --git a/src/timeconv.inl b/src/timeconv.inl
index 2736e163..5ec3b179 100644
--- a/src/timeconv.inl
+++ b/src/timeconv.inl
@@ -3,6 +3,7 @@
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying 
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 // boostinspect:nounnamed
 
 namespace {
diff --git a/src/tss.cpp b/src/tss.cpp
index a0ced8e4..5c77bb52 100644
--- a/src/tss.cpp
+++ b/src/tss.cpp
@@ -31,7 +31,7 @@ boost::once_flag tss_data_once = BOOST_ONCE_INIT;
 boost::mutex* tss_data_mutex = 0;
 tss_data_cleanup_handlers_type* tss_data_cleanup_handlers = 0;
 #if defined(BOOST_HAS_WINTHREADS)
-    DWORD tss_data_native_key;
+    DWORD tss_data_native_key=TLS_OUT_OF_INDEXES;
 #elif defined(BOOST_HAS_PTHREADS)
     pthread_key_t tss_data_native_key;
 #elif defined(BOOST_HAS_MPTASKS)
@@ -60,6 +60,7 @@ void tss_data_dec_use(boost::mutex::scoped_lock& lk)
         tss_data_mutex = 0;
 #if defined(BOOST_HAS_WINTHREADS)
         TlsFree(tss_data_native_key);
+        tss_data_native_key=TLS_OUT_OF_INDEXES;
 #elif defined(BOOST_HAS_PTHREADS)
         pthread_key_delete(tss_data_native_key);
 #elif defined(BOOST_HAS_MPTASKS)
@@ -78,13 +79,17 @@ extern "C" void cleanup_slots(void* p)
         (*(*tss_data_cleanup_handlers)[i])((*slots)[i]);
         (*slots)[i] = 0;
     }
+#if defined(BOOST_HAS_WINTHREADS)
+    TlsSetValue(tss_data_native_key,0);
+#endif
     tss_data_dec_use(lock);
     delete slots;
 }
 
 void init_tss_data()
 {
-    std::auto_ptr<tss_data_cleanup_handlers_type> temp(new tss_data_cleanup_handlers_type);
+    std::auto_ptr<tss_data_cleanup_handlers_type> 
+        temp(new tss_data_cleanup_handlers_type);
 
     std::auto_ptr<boost::mutex> temp_mutex(new boost::mutex);
     if (temp_mutex.get() == 0)
@@ -96,9 +101,8 @@ void init_tss_data()
 
     //Allocate tls slot
     tss_data_native_key = TlsAlloc();
-    if (tss_data_native_key == 0xFFFFFFFF)
+    if (tss_data_native_key == TLS_OUT_OF_INDEXES)
         return;
-
 #elif defined(BOOST_HAS_PTHREADS)
     int res = pthread_key_create(&tss_data_native_key, &cleanup_slots);
     if (res != 0)
diff --git a/src/tss_hooks.cpp b/src/tss_hooks.cpp
index 3dcc40f4..be4bb097 100644
--- a/src/tss_hooks.cpp
+++ b/src/tss_hooks.cpp
@@ -1,7 +1,5 @@
-// (C) Copyright Michael Glassford 2004.
-// Copyright (c) 2006 Peter Dimov
-// Copyright (c) 2006 Anthony Williams
-//
+// Copyright (C) 2004 Michael Glassford
+// Copyright (C) 2006 Roland Schwarz
 // Use, modification and distribution are subject to the
 // Boost Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,152 +8,205 @@
 
 #if defined(BOOST_HAS_WINTHREADS)
 
-#include <boost/thread/detail/tss_hooks.hpp>
+    #include <boost/thread/detail/tss_hooks.hpp>
 
-#include <boost/assert.hpp>
-#include <boost/thread/once.hpp>
+    #include <boost/assert.hpp>
+//    #include <boost/thread/mutex.hpp>
+    #include <boost/thread/once.hpp>
 
-#include <list>
+    #include <list>
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+    #define WIN32_LEAN_AND_MEAN
+    #include <windows.h>
 
-namespace
-{
-
-typedef std::list<thread_exit_handler> thread_exit_handlers;
-
-const DWORD invalid_tls_key = TLS_OUT_OF_INDEXES;
-DWORD tls_key = invalid_tls_key;
-
-boost::once_flag once_init_tls_key = BOOST_ONCE_INIT;
-
-void init_tls_key()
-{
-    tls_key = TlsAlloc();
-}
-
-} // unnamed namespace
-
-extern "C" BOOST_THREAD_DECL int at_thread_exit( thread_exit_handler exit_handler )
-{
-    boost::call_once( init_tls_key, once_init_tls_key );
-
-    if( tls_key == invalid_tls_key )
+    namespace
     {
-        return -1;
+        class CScopedCSLock
+        {
+        public:
+            CScopedCSLock(LPCRITICAL_SECTION cs) : cs(cs), lk(true) {
+                ::EnterCriticalSection(cs);
+            }
+            ~CScopedCSLock() {
+                if (lk) ::LeaveCriticalSection(cs);
+            }
+            void Unlock() {
+                lk = false;
+                ::LeaveCriticalSection(cs);
+            }
+        private:
+            bool lk;
+            LPCRITICAL_SECTION cs;
+        };
+
+        typedef std::list<thread_exit_handler> thread_exit_handlers;
+
+        boost::once_flag once_init_threadmon_mutex = BOOST_ONCE_INIT;
+        //boost::mutex* threadmon_mutex;
+        // We don't use boost::mutex here, to avoid a memory leak report,
+        // because we cannot delete it again easily.
+        CRITICAL_SECTION threadmon_mutex;
+        void init_threadmon_mutex(void)
+        {
+            //threadmon_mutex = new boost::mutex;
+            //if (!threadmon_mutex)
+            //    throw boost::thread_resource_error();
+            ::InitializeCriticalSection(&threadmon_mutex);
+        }
+
+        const DWORD invalid_tls_key = TLS_OUT_OF_INDEXES;
+        DWORD tls_key = invalid_tls_key;
+
+        unsigned long attached_thread_count = 0;
     }
 
-    // Get the exit handlers list for the current thread from tls.
+    /*
+    Calls to DllMain() and tls_callback() are serialized by the OS;
+    however, calls to at_thread_exit are not, so it must be protected
+    by a mutex. Since we already need a mutex for at_thread_exit(),
+    and since there is no guarantee that on_process_enter(),
+    on_process_exit(), on_thread_enter(), and on_thread_exit()
+    will be called only from DllMain() or tls_callback(), it makes
+    sense to protect those, too.
+    */
 
-    thread_exit_handlers* exit_handlers =
-        static_cast< thread_exit_handlers* >( TlsGetValue( tls_key ) );
-
-    if( exit_handlers == 0 )
+    extern "C" BOOST_THREAD_DECL int at_thread_exit(
+        thread_exit_handler exit_handler
+        )
     {
-        // No exit handlers list was created yet.
+        boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+        //boost::mutex::scoped_lock lock(*threadmon_mutex);
+        CScopedCSLock lock(&threadmon_mutex);
+
+        //Allocate a tls slot if necessary.
+
+        if (tls_key == invalid_tls_key)
+            tls_key = TlsAlloc();
+
+        if (tls_key == invalid_tls_key)
+            return -1;
+
+        //Get the exit handlers list for the current thread from tls.
+
+        thread_exit_handlers* exit_handlers =
+            static_cast<thread_exit_handlers*>(TlsGetValue(tls_key));
+
+        if (!exit_handlers)
+        {
+            //No exit handlers list was created yet.
+
+            try
+            {
+                //Attempt to create a new exit handlers list.
+
+                exit_handlers = new thread_exit_handlers;
+                if (!exit_handlers)
+                    return -1;
+
+                //Attempt to store the list pointer in tls.
+
+                if (TlsSetValue(tls_key, exit_handlers))
+                    ++attached_thread_count;
+                else
+                {
+                    delete exit_handlers;
+                    return -1;
+                }
+            }
+            catch (...)
+            {
+                return -1;
+            }
+        }
+
+        //Like the C runtime library atexit() function,
+        //functions should be called in the reverse of
+        //the order they are added, so push them on the
+        //front of the list.
 
         try
         {
-            // Attempt to create a new exit handlers list.
-
-            exit_handlers = new thread_exit_handlers;
-
-            if( exit_handlers == 0 )
-            {
-                return -1;
-            }
-
-            // Attempt to store the list pointer in tls.
-
-            if( !TlsSetValue( tls_key, exit_handlers ) )
-            {
-                delete exit_handlers;
-                return -1;
-            }
+            exit_handlers->push_front(exit_handler);
         }
-        catch( ... )
+        catch (...)
         {
             return -1;
         }
+
+        //Like the atexit() function, a result of zero
+        //indicates success.
+
+        return 0;
     }
 
-    // Like the C runtime library atexit() function,
-    // functions should be called in the reverse of
-    // the order they are added, so push them on the
-    // front of the list.
+    extern "C" BOOST_THREAD_DECL void on_process_enter(void)
+    {
+        boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+//        boost::mutex::scoped_lock lock(*threadmon_mutex);
+        CScopedCSLock lock(&threadmon_mutex);
 
-    try
-    {
-        exit_handlers->push_front( exit_handler );
-    }
-    catch( ... )
-    {
-        return -1;
+        BOOST_ASSERT(attached_thread_count == 0);
     }
 
-    // Like the atexit() function, a result of zero
-    // indicates success.
-
-    return 0;
-}
-
-extern "C" BOOST_THREAD_DECL void on_process_enter()
-{
-}
-
-extern "C" BOOST_THREAD_DECL void on_process_exit()
-{
-    if( tls_key != invalid_tls_key )
+    extern "C" BOOST_THREAD_DECL void on_process_exit(void)
     {
-        TlsFree(tls_key);
-    }
-}
+        boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+//        boost::mutex::scoped_lock lock(*threadmon_mutex);
+        CScopedCSLock lock(&threadmon_mutex);
 
-extern "C" BOOST_THREAD_DECL void on_thread_enter()
-{
-}
+        BOOST_ASSERT(attached_thread_count == 0);
 
-extern "C" BOOST_THREAD_DECL void on_thread_exit()
-{
-    // Initializing tls_key here ensures its proper visibility
-    boost::call_once( init_tls_key, once_init_tls_key );
+        //Free the tls slot if one was allocated.
 
-    // Get the exit handlers list for the current thread from tls.
-
-    if( tls_key == invalid_tls_key )
-    {
-        return;
-    }
-
-    thread_exit_handlers* exit_handlers =
-        static_cast< thread_exit_handlers* >( TlsGetValue( tls_key ) );
-
-    // If a handlers list was found, invoke its handlers.
-
-    if( exit_handlers != 0 )
-    {
-        // Call each handler and remove it from the list
-
-        while( !exit_handlers->empty() )
+        if (tls_key != invalid_tls_key)
         {
-            if( thread_exit_handler exit_handler = *exit_handlers->begin() )
+            TlsFree(tls_key);
+            tls_key = invalid_tls_key;
+        }
+    }
+
+    extern "C" BOOST_THREAD_DECL void on_thread_enter(void)
+    {
+        //boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+        //boost::mutex::scoped_lock lock(*threadmon_mutex);
+    }
+
+    extern "C" BOOST_THREAD_DECL void on_thread_exit(void)
+    {
+        boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+//        boost::mutex::scoped_lock lock(*threadmon_mutex);
+        CScopedCSLock lock(&threadmon_mutex);
+
+        //Get the exit handlers list for the current thread from tls.
+
+        if (tls_key == invalid_tls_key)
+            return;
+
+        thread_exit_handlers* exit_handlers =
+            static_cast<thread_exit_handlers*>(TlsGetValue(tls_key));
+
+        //If a handlers list was found, use it.
+
+        if (exit_handlers && TlsSetValue(tls_key, 0))
+        {
+            BOOST_ASSERT(attached_thread_count > 0);
+            --attached_thread_count;
+
+            //lock.unlock();
+            lock.Unlock();
+
+            //Call each handler and remove it from the list
+
+            while (!exit_handlers->empty())
             {
-                (*exit_handler)();
+                if (thread_exit_handler exit_handler = *exit_handlers->begin())
+                    (*exit_handler)();
+                exit_handlers->pop_front();
             }
 
-            exit_handlers->pop_front();
-        }
-
-        // If TlsSetValue fails, we can't delete the list,
-        // since a second call to on_thread_exit will try
-        // to access it.
-
-        if( TlsSetValue( tls_key, 0 ) )
-        {
             delete exit_handlers;
+            exit_handlers = 0;
         }
     }
-}
 
 #endif //defined(BOOST_HAS_WINTHREADS)
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 715f546e..f3605d5b 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -40,6 +40,6 @@ rule thread-run ( sources )
           [ thread-run test_once.cpp ]
           [ thread-run test_xtime.cpp ]
           [ thread-run test_barrier.cpp ]		   
-          [ thread-run test_read_write_mutex.cpp ]
+#          [ thread-run test_read_write_mutex.cpp ]
     ;
 }
diff --git a/test/test_read_write_mutex.cpp b/test/test_read_write_mutex.cpp
deleted file mode 100644
index f1214e25..00000000
--- a/test/test_read_write_mutex.cpp
+++ /dev/null
@@ -1,786 +0,0 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/thread/thread.hpp>
-#include <boost/thread/xtime.hpp>
-#include <boost/thread/read_write_mutex.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-
-#define TS_CHECK(pred) \
-    do { if (!(pred)) BOOST_ERROR (#pred); } while (0)
-#define TS_CHECK_MSG(pred, msg) \
-    do { if (!(pred)) BOOST_ERROR (msg); } while (0)
-
-namespace {
-
-int shared_val = 0;
-
-boost::xtime xsecs(int secs)
-{
-    //Create an xtime that is secs seconds from now
-    boost::xtime ret;
-    TS_CHECK (boost::TIME_UTC == boost::xtime_get(&ret, boost::TIME_UTC));
-    ret.sec += secs;
-    return ret;
-}
-
-#define MESSAGE "w1=" << w1.value_ << ", w2=" << w2.value_ << ", r1=" << r1.value_ << ", r2=" << r2.value_
-
-template <typename RW>
-class thread_adapter
-{
-public:
-
-    thread_adapter(
-        void (*func)(void*, RW&),
-        void* param1,
-        RW &param2
-        )
-        : func_(func)
-        , param1_(param1)
-        , param2_(param2)
-    {}
-
-    void operator()() const
-    {
-        func_(param1_, param2_);
-    }
-
-private:
-
-    void (*func_)(void*, RW&);
-    void* param1_;
-    RW& param2_;
-};
-
-const int k_data_init = -1;
-
-template <typename RW>
-struct data
-{
-    data(
-        int id,
-        RW& m,
-        int wait_for_lock_secs,
-        int sleep_with_lock_secs,
-        bool demote_after_write = false
-        )
-        : id_(id)
-        , wait_for_lock_secs_(wait_for_lock_secs)
-        , sleep_with_lock_secs_(sleep_with_lock_secs)
-        , test_promotion_and_demotion_(demote_after_write)
-        , value_(k_data_init)
-        , rw_(m)
-    {}
-
-    int id_;
-    int wait_for_lock_secs_;
-    int sleep_with_lock_secs_;
-    bool test_promotion_and_demotion_;
-    int value_;
-
-    RW& rw_;
-};
-
-template<typename RW>
-void plain_writer(void* arg, RW& rw)
-{
-    try
-    {
-        data<RW>* pdata = (data<RW>*) arg;
-        TS_CHECK_MSG(pdata->wait_for_lock_secs_ == 0, "pdata->wait_for_lock_secs_: " << pdata->wait_for_lock_secs_);
-
-        typename RW::scoped_read_write_lock l(
-            rw, 
-            pdata->test_promotion_and_demotion_ 
-                ? boost::read_write_lock_state::read_locked 
-                : boost::read_write_lock_state::write_locked
-            );
-
-        bool succeeded = true;
-
-        if (pdata->test_promotion_and_demotion_)
-        {
-            try
-            {
-                l.promote();
-            }
-            catch(const boost::lock_error&)
-            {
-                succeeded = false;
-            }
-        }
-
-        if (succeeded)
-        {
-            if (pdata->sleep_with_lock_secs_ > 0)
-                boost::thread::sleep(xsecs(pdata->sleep_with_lock_secs_));
-
-            shared_val += 10;
-
-            if (pdata->test_promotion_and_demotion_)
-                l.demote();
-
-            pdata->value_ = shared_val;
-        }
-    }
-    catch(...)
-    {
-        TS_CHECK_MSG(false, "plain_writer() exception!");
-        throw;
-    }
-}
-
-template<typename RW>
-void plain_reader(void* arg, RW& rw)
-{
-    try
-    {
-        data<RW>* pdata = (data<RW>*)arg;
-        TS_CHECK(!pdata->test_promotion_and_demotion_);
-        TS_CHECK_MSG(pdata->wait_for_lock_secs_ == 0, "pdata->wait_for_lock_secs_: " << pdata->wait_for_lock_secs_);
-
-        typename RW::scoped_read_write_lock l(rw, boost::read_write_lock_state::read_locked);
-
-        if (pdata->sleep_with_lock_secs_ > 0)
-            boost::thread::sleep(xsecs(pdata->sleep_with_lock_secs_));
-
-        pdata->value_ = shared_val;
-    }
-    catch(...)
-    {
-        TS_CHECK_MSG(false, "plain_reader() exception!");
-        throw;
-    }
-}
-
-template<typename RW>
-void try_writer(void* arg, RW& rw)
-{
-    try
-    {
-        data<RW>* pdata = (data<RW>*) arg;
-        TS_CHECK_MSG(pdata->wait_for_lock_secs_ == 0, "pdata->wait_for_lock_secs_: " << pdata->wait_for_lock_secs_);
-
-        typename RW::scoped_try_read_write_lock l(rw, boost::read_write_lock_state::unlocked);
-
-        bool succeeded = false;
-
-        if (pdata->test_promotion_and_demotion_)
-            succeeded = l.try_read_lock() && l.try_promote();
-        else
-            succeeded = l.try_write_lock();
-
-        if (succeeded)
-        {
-            if (pdata->sleep_with_lock_secs_ > 0)
-                boost::thread::sleep(xsecs(pdata->sleep_with_lock_secs_));
-
-            shared_val += 10;
-
-            if (pdata->test_promotion_and_demotion_)
-                l.demote();
-
-            pdata->value_ = shared_val;
-        }
-    }
-    catch(...)
-    {
-        TS_CHECK_MSG(false, "try_writer() exception!");
-        throw;
-    }
-}
-
-template<typename RW>
-void try_reader(void*arg, RW& rw)
-{
-    try
-    {
-        data<RW>* pdata = (data<RW>*)arg;
-        TS_CHECK(!pdata->test_promotion_and_demotion_);
-        TS_CHECK_MSG(pdata->wait_for_lock_secs_ == 0, "pdata->wait_for_lock_secs_: " << pdata->wait_for_lock_secs_);
-
-        typename RW::scoped_try_read_write_lock l(rw, boost::read_write_lock_state::unlocked);
-
-        if (l.try_read_lock())
-        {
-            if (pdata->sleep_with_lock_secs_ > 0)
-                boost::thread::sleep(xsecs(pdata->sleep_with_lock_secs_));
-
-            pdata->value_ = shared_val;
-        }
-    }
-    catch(...)
-    {
-        TS_CHECK_MSG(false, "try_reader() exception!");
-        throw;
-    }
-}
-
-template<typename RW>
-void timed_writer(void* arg, RW& rw)
-{
-    try
-    {
-        data<RW>* pdata = (data<RW>*)arg;
-
-        typename RW::scoped_timed_read_write_lock l(rw, boost::read_write_lock_state::unlocked);
-
-        bool succeeded = false;
-
-        boost::xtime xt = xsecs(pdata->wait_for_lock_secs_);
-        if (pdata->test_promotion_and_demotion_)
-            succeeded = l.timed_read_lock(xt) && l.timed_promote(xt);
-        else
-            succeeded = l.timed_write_lock(xt);
-
-        if (succeeded)
-        {
-            if (pdata->sleep_with_lock_secs_ > 0)
-                boost::thread::sleep(xsecs(pdata->sleep_with_lock_secs_));
-
-            shared_val += 10;
-
-            if (pdata->test_promotion_and_demotion_)
-                l.demote();
-
-            pdata->value_ = shared_val;
-        }
-    }
-    catch(...)
-    {
-        TS_CHECK_MSG(false, "timed_writer() exception!");
-        throw;
-    }
-}
-
-template<typename RW>
-void timed_reader(void* arg, RW& rw)
-{
-    try
-    {
-        data<RW>* pdata = (data<RW>*)arg;
-        TS_CHECK(!pdata->test_promotion_and_demotion_);
-
-        typename RW::scoped_timed_read_write_lock l(rw,boost::read_write_lock_state::unlocked);
-
-        boost::xtime xt = xsecs(pdata->wait_for_lock_secs_);
-        if (l.timed_read_lock(xt))
-        {
-            if (pdata->sleep_with_lock_secs_ > 0)
-                boost::thread::sleep(xsecs(pdata->sleep_with_lock_secs_));
-
-            pdata->value_ = shared_val;
-        }
-    }
-    catch(...)
-    {
-        TS_CHECK_MSG(false, "timed_reader() exception!");
-        throw;
-    }
-}
-
-template<typename RW>
-void clear_data(data<RW>& data1, data<RW>& data2, data<RW>& data3, data<RW>& data4)
-{
-    shared_val = 0;
-    data1.value_ = k_data_init;
-    data2.value_ = k_data_init;
-    data3.value_ = k_data_init;
-    data4.value_ = k_data_init;
-}
-
-bool shared_test_writelocked = false;
-bool shared_test_readlocked = false;
-bool shared_test_unlocked = false;
-
-template<typename RW>
-void run_try_tests(void* arg, RW& rw)
-{
-    try
-    {
-        TS_CHECK(shared_test_writelocked || shared_test_readlocked || shared_test_unlocked);
-
-        typename RW::scoped_try_read_write_lock l(rw, boost::read_write_lock_state::unlocked);
-
-        if (shared_test_writelocked)
-        {
-            //Verify that write lock blocks other write locks
-            TS_CHECK(!l.try_write_lock());
-
-            //Verify that write lock blocks read locks
-            TS_CHECK(!l.try_read_lock());
-        }
-        else if (shared_test_readlocked)
-        {
-            //Verify that read lock blocks write locks
-            TS_CHECK(!l.try_write_lock());
-
-            //Verify that read lock does not block other read locks
-            TS_CHECK(l.try_read_lock());
-
-            //Verify that read lock blocks promotion
-            TS_CHECK(!l.try_promote());
-        }
-        else if (shared_test_unlocked)
-        {
-            //Verify that unlocked does not blocks write locks
-            TS_CHECK(l.try_write_lock());
-
-            //Verify that unlocked does not block demotion
-            TS_CHECK(l.try_demote());
-
-            l.unlock();
-
-            //Verify that unlocked does not block read locks
-            TS_CHECK(l.try_read_lock());
-
-            //Verify that unlocked does not block promotion
-            TS_CHECK(l.try_promote());
-            
-            l.unlock();
-        }
-    }
-    catch(...)
-    {
-        TS_CHECK_MSG(false, "run_try_tests() exception!");
-        throw;
-    }
-}
-
-template<typename RW>
-void test_plain_read_write_mutex(RW& rw, bool test_promotion_and_demotion)
-{
-    //Verify that a write lock prevents both readers and writers from obtaining a lock
-    {
-        shared_val = 0;
-        data<RW> r1(1, rw, 0, 0);
-        data<RW> r2(2, rw, 0, 0);
-        data<RW> w1(3, rw, 0, 0);
-        data<RW> w2(4, rw, 0, 0);
-
-        //Write-lock the mutex and queue up other readers and writers
-
-        typename RW::scoped_read_write_lock l(rw, boost::read_write_lock_state::write_locked);
-
-        boost::thread tr1(thread_adapter<RW>(plain_reader, &r1, rw));
-        boost::thread tr2(thread_adapter<RW>(plain_reader, &r2, rw));
-        boost::thread tw1(thread_adapter<RW>(plain_writer, &w1, rw));
-        boost::thread tw2(thread_adapter<RW>(plain_writer, &w2, rw));
-
-        boost::thread::sleep(xsecs(1));
-
-        //At this point, neither queued readers nor queued writers should have obtained access
-
-        TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-        TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-        TS_CHECK_MSG(r1.value_ == k_data_init, MESSAGE);
-        TS_CHECK_MSG(r2.value_ == k_data_init, MESSAGE);
-
-        if (test_promotion_and_demotion)
-        {
-            l.demote();
-            boost::thread::sleep(xsecs(1));
-            //:boost::thread tr3(thread_adapter<RW>(plain_reader, &r3, rw));
-
-            if (rw.policy() == boost::read_write_scheduling_policy::writer_priority)
-            {
-                //Expected result:
-                //Since writers have priority, demotion doesn't release any readers.
-                TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == k_data_init, MESSAGE);
-            }
-            else if (rw.policy() == boost::read_write_scheduling_policy::reader_priority)
-            {
-                //Expected result:
-                //Since readers have priority, demotion releases all readers.
-                TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 0, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 0, MESSAGE);
-            }
-            else if (rw.policy() == boost::read_write_scheduling_policy::alternating_many_reads)
-            {
-                //Expected result:
-                //Since readers can be released many at a time, demotion releases all queued readers.
-                TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 0, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 0, MESSAGE);
-                //:TS_CHECK_MSG(r3.value_ == k_data_init, MESSAGE);
-            }
-            else if (rw.policy() == boost::read_write_scheduling_policy::alternating_single_read)
-            {
-                //Expected result:
-                //Since readers can be released only one at a time, demotion releases one queued reader.
-                TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == k_data_init || r1.value_ == 0, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == k_data_init || r2.value_ == 0, MESSAGE);
-                TS_CHECK_MSG(r1.value_ != r2.value_, MESSAGE);
-            }
-        }
-        
-        l.unlock();
-
-        tr2.join();
-        tr1.join();
-        tw2.join();
-        tw1.join();
-
-        if (rw.policy() == boost::read_write_scheduling_policy::writer_priority)
-        {
-            if (!test_promotion_and_demotion)
-            {
-                //Expected result: 
-                //1) either w1 or w2 obtains and releases the lock
-                //2) the other of w1 and w2 obtains and releases the lock
-                //3) r1 and r2 obtain and release the lock "simultaneously"
-                TS_CHECK_MSG(w1.value_ == 10 || w1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == 10 || w2.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w1.value_ != w2.value_, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 20, MESSAGE);
-            }
-            else
-            {
-                //Expected result: 
-                //The same, except that either w1 or w2 (but not both) may
-                //fail to promote to a write lock,
-                //and r1, r2, or both may "sneak in" ahead of w1 and/or w2
-                //by obtaining a read lock before w1 or w2 can promote
-                //their initial read lock to a write lock.
-                TS_CHECK_MSG(w1.value_ == k_data_init || w1.value_ == 10 || w1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == k_data_init || w2.value_ == 10 || w2.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w1.value_ != w2.value_, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == k_data_init || r1.value_ == 10 || r1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == k_data_init || r2.value_ == 10 || r2.value_ == 20, MESSAGE);
-            }
-        }
-        else if (rw.policy() == boost::read_write_scheduling_policy::reader_priority)
-        {
-            if (!test_promotion_and_demotion)
-            {
-                //Expected result: 
-                //1) r1 and r2 obtain and release the lock "simultaneously"
-                //2) either w1 or w2 obtains and releases the lock
-                //3) the other of w1 and w2 obtains and releases the lock
-                TS_CHECK_MSG(w1.value_ == 10 || w1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == 10 || w2.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w1.value_ != w2.value_, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 0, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 0, MESSAGE);
-            }
-            else
-            {
-                //Expected result: 
-                //The same, except that either w1 or w2 (but not both) may
-                //fail to promote to a write lock.
-                TS_CHECK_MSG(w1.value_ == k_data_init || w1.value_ == 10 || w1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == k_data_init || w2.value_ == 10 || w2.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w1.value_ != w2.value_, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 0, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 0, MESSAGE);
-            }
-        }
-        else if (rw.policy() == boost::read_write_scheduling_policy::alternating_many_reads)
-        {
-            if (!test_promotion_and_demotion)
-            {
-                //Expected result: 
-                //1) r1 and r2 obtain and release the lock "simultaneously"
-                //2) either w1 or w2 obtains and releases the lock
-                //3) the other of w1 and w2 obtains and releases the lock
-                TS_CHECK_MSG(w1.value_ == 10 || w1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == 10 || w2.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w1.value_ != w2.value_, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 0, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 0, MESSAGE);
-            }
-            else
-            {
-                //Expected result: 
-                //The same, except that either w1 or w2 (but not both) may
-                //fail to promote to a write lock.
-                TS_CHECK_MSG(w1.value_ == k_data_init || w1.value_ == 10 || w1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == k_data_init || w2.value_ == 10 || w2.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w1.value_ != w2.value_, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 0, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 0, MESSAGE);
-            }
-        }
-        else if (rw.policy() == boost::read_write_scheduling_policy::alternating_single_read)
-        {
-            if (!test_promotion_and_demotion)
-            {
-                //Expected result:
-                //1) either r1 or r2 obtains and releases the lock
-                //2) either w1 or w2 obtains and releases the lock
-                //3) the other of r1 and r2 obtains and releases the lock
-                //4) the other of w1 and w2 obtains and release the lock
-                TS_CHECK_MSG(w1.value_ == 10 || w1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == 10 || w2.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w1.value_ != w2.value_, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 0 || r1.value_ == 10, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 0 || r2.value_ == 10, MESSAGE);
-                TS_CHECK_MSG(r1.value_ != r2.value_, MESSAGE);
-            }
-            else
-            {
-                //Expected result:
-                //Since w1 and w2 start as read locks, r1, r2, w1, and w2 
-                //obtain read locks "simultaneously". Each of w1 and w2, 
-                //after it obtain a read lock, attempts to promote to a
-                //write lock; this attempt fails if the other has
-                //already done so and currently holds the write lock;
-                //otherwise it will succeed as soon as any other 
-                //read locks have been released.
-                //In other words, any ordering is possible, and either
-                //w1 or w2 (but not both) may fail to obtain the lock
-                //altogether.
-                TS_CHECK_MSG(w1.value_ == k_data_init || w1.value_ == 10 || w1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w2.value_ == k_data_init || w2.value_ == 10 || w2.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(w1.value_ != w2.value_, MESSAGE);
-                TS_CHECK_MSG(r1.value_ == 0 || r1.value_ == 10 || r1.value_ == 20, MESSAGE);
-                TS_CHECK_MSG(r2.value_ == 0 || r2.value_ == 10 || r2.value_ == 20, MESSAGE);
-            }
-        }
-    }
-
-    //Verify that a read lock prevents readers but not writers from obtaining a lock
-    {
-        shared_val = 0;
-        data<RW> r1(1, rw, 0, 0);
-        data<RW> r2(2, rw, 0, 0);
-        data<RW> w1(3, rw, 0, 0);
-        data<RW> w2(4, rw, 0, 0);
-
-        //Read-lock the mutex and queue up other readers and writers
-
-        typename RW::scoped_read_write_lock l(rw, boost::read_write_lock_state::read_locked);
-
-        boost::thread tr1(thread_adapter<RW>(plain_reader, &r1, rw));
-        boost::thread tr2(thread_adapter<RW>(plain_reader, &r2, rw));
-
-        boost::thread::sleep(xsecs(1));
-
-        boost::thread tw1(thread_adapter<RW>(plain_writer, &w1, rw));
-        boost::thread tw2(thread_adapter<RW>(plain_writer, &w2, rw));
-
-        boost::thread::sleep(xsecs(1));
-
-        //Expected result: all readers passed through before the writers entered
-        TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-        TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-        TS_CHECK_MSG(r1.value_ == 0, MESSAGE);
-        TS_CHECK_MSG(r2.value_ == 0, MESSAGE);
-
-        if (test_promotion_and_demotion)
-        {
-            l.promote();
-        }
-        
-        l.unlock();
-
-        tr2.join();
-        tr1.join();
-        tw2.join();
-        tw1.join();
-    }
-
-    //Verify that a read lock prevents readers but not writers from obtaining a lock
-    {
-        shared_val = 0;
-        data<RW> r1(1, rw, 0, 0);
-        data<RW> r2(2, rw, 0, 0);
-        data<RW> w1(3, rw, 0, 0);
-        data<RW> w2(4, rw, 0, 0);
-
-        //Read-lock the mutex and queue up other readers and writers
-
-        typename RW::scoped_read_write_lock l(rw, boost::read_write_lock_state::read_locked);
-
-        boost::thread tw1(thread_adapter<RW>(plain_writer, &w1, rw));
-        boost::thread tw2(thread_adapter<RW>(plain_writer, &w2, rw));
-
-        boost::thread::sleep(xsecs(1));
-
-        boost::thread tr1(thread_adapter<RW>(plain_reader, &r1, rw));
-        boost::thread tr2(thread_adapter<RW>(plain_reader, &r2, rw));
-
-        boost::thread::sleep(xsecs(1));
-
-        if (rw.policy() == boost::read_write_scheduling_policy::writer_priority)
-        {
-            //Expected result: 
-            //Writers have priority, so no readers have been released
-            TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(r1.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(r2.value_ == k_data_init, MESSAGE);
-        }
-        else if (rw.policy() == boost::read_write_scheduling_policy::reader_priority)
-        {
-            //Expected result: 
-            //Readers have priority, so all readers have been released
-            TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(r1.value_ == 0, MESSAGE);
-            TS_CHECK_MSG(r2.value_ == 0, MESSAGE);
-        }
-        else if (rw.policy() == boost::read_write_scheduling_policy::alternating_many_reads)
-        {
-            //Expected result: 
-            //It's the writers' turn, so no readers have been released
-            TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(r1.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(r2.value_ == k_data_init, MESSAGE);
-        }
-        else if (rw.policy() == boost::read_write_scheduling_policy::alternating_single_read)
-        {
-            //Expected result: 
-            //It's the writers' turn, so no readers have been released
-            TS_CHECK_MSG(w1.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(w2.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(r1.value_ == k_data_init, MESSAGE);
-            TS_CHECK_MSG(r2.value_ == k_data_init, MESSAGE);
-        }
-
-        if (test_promotion_and_demotion)
-        {
-            l.promote();
-        }
-        
-        l.unlock();
-
-        tr2.join();
-        tr1.join();
-        tw2.join();
-        tw1.join();
-    }
-}
-
-template<typename RW>
-void test_try_read_write_mutex(RW& rw, bool test_promotion_and_demotion)
-{
-    //Repeat the plain tests with the try lock.
-    //This is important to verify that try locks are proper
-    //read_write_mutexes as well.
-
-    test_plain_read_write_mutex(rw, test_promotion_and_demotion);
-
-    //Verify try_* operations with write-locked mutex
-    {
-        typename RW::scoped_try_read_write_lock l(rw, boost::read_write_lock_state::write_locked);
-
-        shared_test_writelocked = true;
-        shared_test_readlocked = false;
-        shared_test_unlocked = false;
-        
-        boost::thread test_thread(thread_adapter<RW>(run_try_tests, NULL, rw));
-        test_thread.join();
-    }
-
-    //Verify try_* operations with read-locked mutex
-    {
-        typename RW::scoped_try_read_write_lock l(rw, boost::read_write_lock_state::read_locked);
-        
-        shared_test_writelocked = false;
-        shared_test_readlocked = true;
-        shared_test_unlocked = false;
-        
-        boost::thread test_thread(thread_adapter<RW>(run_try_tests, NULL, rw));
-        test_thread.join();
-    }
-
-    //Verify try_* operations with unlocked mutex
-    {
-        shared_test_writelocked = false;
-        shared_test_readlocked = false;
-        shared_test_unlocked = true;
-        
-        boost::thread test_thread(thread_adapter<RW>(run_try_tests, NULL, rw));
-        test_thread.join();
-    }
-}
-
-template<typename RW>
-void test_timed_read_write_mutex(RW& rw, bool test_promotion_and_demotion)
-{
-    //Repeat the try tests with the timed lock.
-    //This is important to verify that timed locks are proper
-    //try locks as well.
-
-    test_try_read_write_mutex(rw, test_promotion_and_demotion);
-
-    //:More tests here
-}
-
-} // namespace
-
-void do_test_read_write_mutex(bool test_promotion_and_demotion)
-{
-    //Run every test for each scheduling policy
-
-    for(int i = (int) boost::read_write_scheduling_policy::writer_priority;
-        i <= (int) boost::read_write_scheduling_policy::alternating_single_read;
-        i++)
-    {
-        std::cout << "plain test, sp=" << i 
-            << (test_promotion_and_demotion ? " with promotion & demotion" : " without promotion & demotion") 
-            << "\n";
-        std::cout.flush();
-
-        {
-            boost::read_write_mutex plain_rw(static_cast<boost::read_write_scheduling_policy::read_write_scheduling_policy_enum>(i));
-            test_plain_read_write_mutex(plain_rw, test_promotion_and_demotion);
-        }
-
-        std::cout << "try test, sp=" << i 
-            << (test_promotion_and_demotion ? " with promotion & demotion" : " without promotion & demotion")
-            << "\n";
-        std::cout.flush();
-
-        {
-            boost::try_read_write_mutex try_rw(static_cast<boost::read_write_scheduling_policy::read_write_scheduling_policy_enum>(i));
-            test_try_read_write_mutex(try_rw, test_promotion_and_demotion);
-        }
-
-        std::cout << "timed test, sp=" << i 
-            << (test_promotion_and_demotion ? " with promotion & demotion" : " without promotion & demotion") 
-            << "\n";
-        std::cout.flush();
-
-        {
-            boost::timed_read_write_mutex timed_rw(static_cast<boost::read_write_scheduling_policy::read_write_scheduling_policy_enum>(i));
-            test_timed_read_write_mutex(timed_rw, test_promotion_and_demotion);
-        }
-    }
-}
-
-void test_read_write_mutex()
-{
-    do_test_read_write_mutex(false);
-    do_test_read_write_mutex(true);
-}
-
-boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
-{
-    boost::unit_test_framework::test_suite* test =
-        BOOST_TEST_SUITE("Boost.Threads: read_write_mutex test suite");
-
-    test->add(BOOST_TEST_CASE(&test_read_write_mutex));
-
-    return test;
-}
diff --git a/test/test_tss.cpp b/test/test_tss.cpp
index 2eb8a015..6ed570f1 100644
--- a/test/test_tss.cpp
+++ b/test/test_tss.cpp
@@ -144,12 +144,11 @@ void do_test_tss()
             << "\n";
         std::cout.flush();
 
-        // The following is not really an error. TSS cleanup support still is available
-        // for threads, launched via the boost API. Also this usually will be triggered
-        // only when bound to the static version of the thread lib.
-        // 2006-10-15 Roland Schwarz
+        // The following is not really an error. TSS cleanup support still is available for boost threads.
+        // Also this usually will be triggered only when bound to the static version of thread lib.
+        // 2006-10-02 Roland Schwarz
         //BOOST_CHECK_EQUAL(tss_instances, 0);
-        BOOST_CHECK_MESSAGE(tss_instances ==0, "Support of automatic tss cleanup for native threading API not available");
+        BOOST_CHECK_MESSAGE(tss_instances == 0, "Support of automatic tss cleanup for native threading API not available");
         BOOST_CHECK_EQUAL(tss_total, 5);
     #endif
 }
diff --git a/test/util.inl b/test/util.inl
index 9a6676b9..32e7c77a 100644
--- a/test/util.inl
+++ b/test/util.inl
@@ -16,6 +16,8 @@
 #   define DEFAULT_EXECUTION_MONITOR_TYPE execution_monitor::use_condition
 #endif
 
+// boostinspect:nounnamed
+
 namespace
 {
 inline boost::xtime delay(int secs, int msecs=0, int nsecs=0)
diff --git a/tutorial/Jamfile b/tutorial/Jamfile
deleted file mode 100644
index ae0ba3b8..00000000
--- a/tutorial/Jamfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2001-2003
-# William E. Kempf
-#
-#  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-#  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#
-# Boost.Threads tutorial Jamfile
-#
-# Additional configuration variables used:
-#   1. PTW32 may be used on Win32 platforms to specify that the pthreads-win32
-#      library should be used instead of "native" threads. This feature is
-#      mostly used for testing and it's generally recommended you use the
-#      native threading libraries instead. PTW32 should be set to be a list
-#      of two strings, the first specifying the installation path of the
-#      pthreads-win32 library and the second specifying which library
-#      variant to link against (see the pthreads-win32 documentation).
-#      Example: jam -sPTW32="c:\pthreads-win32 pthreadVCE.lib"
-
-project 
-    : requirements <library>/boost/thread//boost_thread
-	<threading>multi 
-    ;
-
-exe helloworld : helloworld.cpp ;
-exe helloworld2 : helloworld2.cpp ;
-exe helloworld3 : helloworld3.cpp ;
-exe helloworld4 : helloworld4.cpp ;
-exe factorial : factorial.cpp ;
-exe factorial2 : factorial2.cpp ;
-exe factorial3 : factorial3.cpp ;
-exe counter : counter.cpp ;
-exe bounded_buffer : bounded_buffer.cpp ;
-exe once : once.cpp ;
-

From 4b5046366b694a11875acd970c8b0e333a2123ae Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Fri, 5 Oct 2007 12:10:06 +0000
Subject: [PATCH 02/16] Changed call_once to header-only template that takes
 arbitrary function objects; this changes parameter order

[SVN r39701]
---
 doc/once-ref.xml              |  18 ++--
 include/boost/thread/once.hpp |  45 ++++-----
 src/mutex.inl                 |   2 +-
 src/once.cpp                  | 180 ++--------------------------------
 src/tss.cpp                   |   2 +-
 src/tss_hooks.cpp             |   8 +-
 test/test_once.cpp            |  71 ++++++++------
 7 files changed, 78 insertions(+), 248 deletions(-)

diff --git a/doc/once-ref.xml b/doc/once-ref.xml
index ba6b5ffc..12480f57 100644
--- a/doc/once-ref.xml
+++ b/doc/once-ref.xml
@@ -65,25 +65,23 @@ void init()
 
 void thread_proc()
 {
-    boost::call_once(&amp;init, once);
+    boost::call_once(once, &amp;init);
 }</programlisting>
 			</para></description>
 			
-			<parameter name="func">
-				<paramtype>void (*func)()</paramtype>
-			</parameter>
-			
 			<parameter name="flag">
 				<paramtype>once_flag&amp;</paramtype>
 			</parameter>
-			
-			<requires>The function <code>func</code> shall not throw
-			exceptions.</requires>
+
+			<parameter name="func">
+				<paramtype>Function func</paramtype>
+			</parameter>
 			
 			<effects>As if (in an atomic fashion): 
-			<code>if (flag == BOOST_ONCE_INIT) func();</code></effects>
+			<code>if (flag == BOOST_ONCE_INIT) func();</code>. If <code>func()</code> throws an exception, it shall be as if this
+thread never invoked <code>call_once</code></effects>
 			
-			<postconditions><code>flag != BOOST_ONCE_INIT</code>
+			<postconditions><code>flag != BOOST_ONCE_INIT</code> unless <code>func()</code> throws an exception.
 			</postconditions>
 		</function>
 	</namespace>
diff --git a/include/boost/thread/once.hpp b/include/boost/thread/once.hpp
index 286465c6..7ff1464a 100644
--- a/include/boost/thread/once.hpp
+++ b/include/boost/thread/once.hpp
@@ -1,37 +1,28 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+#ifndef BOOST_THREAD_ONCE_HPP
+#define BOOST_THREAD_ONCE_HPP
+
+//  once.hpp
 //
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_ONCE_WEK080101_HPP
-#define BOOST_ONCE_WEK080101_HPP
-
-#include <boost/thread/detail/config.hpp>
-
-#if defined(BOOST_HAS_PTHREADS)
-#   include <pthread.h>
-#endif
+//  (C) Copyright 2006-7 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/thread/detail/platform.hpp>
+#ifdef BOOST_HAS_MPTASKS
 namespace boost {
 
-#if defined(BOOST_HAS_PTHREADS)
-
-typedef pthread_once_t once_flag;
-#define BOOST_ONCE_INIT PTHREAD_ONCE_INIT
-
-#elif (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
-
 typedef long once_flag;
 #define BOOST_ONCE_INIT 0
 
+void call_once(once_flag& flag, void (*func)());
+
+}
+
+#else
+#include BOOST_THREAD_PLATFORM(once.hpp)
 #endif
 
-void BOOST_THREAD_DECL call_once(void (*func)(), once_flag& flag);
 
-} // namespace boost
-
-// Change Log:
-//   1 Aug 01  WEKEMPF Initial version.
-
-#endif // BOOST_ONCE_WEK080101_HPP
+#endif
diff --git a/src/mutex.inl b/src/mutex.inl
index 0c3cc9a8..b2c625e0 100644
--- a/src/mutex.inl
+++ b/src/mutex.inl
@@ -38,7 +38,7 @@ void init_TryEnterCriticalSection()
 
 inline bool has_TryEnterCriticalSection()
 {
-    boost::call_once(init_TryEnterCriticalSection, once_init_TryEnterCriticalSection);
+    boost::call_once(once_init_TryEnterCriticalSection, init_TryEnterCriticalSection);
     return g_TryEnterCriticalSection != 0;
 }
 
diff --git a/src/once.cpp b/src/once.cpp
index 47634da4..0215995f 100644
--- a/src/once.cpp
+++ b/src/once.cpp
@@ -6,6 +6,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/config.hpp>
+#ifdef BOOST_HAS_MPTASKS
 
 #include <boost/detail/workaround.hpp>
 
@@ -13,59 +14,8 @@
 #include <cstdio>
 #include <cassert>
 
+#include <Multiprocessing.h>
 
-#if defined(BOOST_HAS_WINTHREADS)
-#   if BOOST_WORKAROUND(__BORLANDC__,<= 0x551)
-      using std::size_t;
-#   endif
-#   include <windows.h>
-#   if defined(BOOST_NO_STRINGSTREAM)
-#       include <strstream>
-
-class unfreezer
-{
-public:
-    unfreezer(std::ostrstream& s) : m_stream(s) {}
-    ~unfreezer() { m_stream.freeze(false); }
-private:
-    std::ostrstream& m_stream;
-};
-
-#   else
-#       include <sstream>
-#   endif
-#elif defined(BOOST_HAS_MPTASKS)
-#   include <Multiprocessing.h>
-#endif
-
-#ifdef BOOST_NO_STDC_NAMESPACE
-namespace std { using ::sprintf; }
-#endif
-
-#if defined(BOOST_HAS_PTHREADS)
-namespace {
-pthread_key_t key;
-pthread_once_t once = PTHREAD_ONCE_INIT;
-
-typedef void (*once_callback)();
-}
-
-extern "C" {
-
-    static void key_init()
-    {
-        pthread_key_create(&key, 0);
-    }
-
-    static void do_once()
-    {
-        once_callback* cb = reinterpret_cast<once_callback*>(
-            pthread_getspecific(key));
-        (**cb)();
-    }
-
-}
-#elif defined(BOOST_HAS_MPTASKS)
 namespace {
 void *remote_call_proxy(void *pData)
 {
@@ -82,125 +32,10 @@ void *remote_call_proxy(void *pData)
 }
 }
 
-#elif defined(BOOST_HAS_WINTHREADS)
-namespace {
-// The signature for InterlockedCompareExchange has changed with the
-// addition of Win64 support. I can't determine any (consistent and
-// portable) way of using conditional compilation to detect this, so
-// we use these type wrappers.  Unfortunately, the various vendors
-// use different calling conventions and other signature anamolies,
-// and thus have unique types as well.  This is known to work on VC6,
-// VC7, Borland 5.5.2 and gcc 3.2.  Are there other signatures for
-// other platforms?
-inline LONG ice_wrapper(LONG (__stdcall *ice)(LONG*, LONG, LONG),
-    volatile LONG* dest, LONG exch, LONG cmp)
-{
-    return (*ice)(const_cast<LONG*>(dest), exch, cmp);
-}
-
-inline LONG ice_wrapper(LONG (__stdcall *ice)(volatile LONG*, LONG, LONG),
-    volatile LONG* dest, LONG exch, LONG cmp)
-{
-    return (*ice)(dest, exch, cmp);
-}
-
-inline LONG ice_wrapper(LPVOID (__stdcall *ice)(LPVOID*, LPVOID, LPVOID),
-    volatile LONG* dest, LONG exch, LONG cmp)
-{
-    return (LONG)(*ice)((LPVOID*)dest, (LPVOID)exch, (LPVOID)cmp);
-}
-
-// The friendly form of InterlockedCompareExchange that defers
-// according to the above function type wrappers.
-inline LONG compare_exchange(volatile LPLONG dest, LONG exch, LONG cmp)
-{
-#ifdef _WIN64
-    // Original patch from Anthony Williams.
-    // I (Roland Schwarz) am trying this for RC_1_34_0, since x64 regressions are
-    // currently not run on x64 platforms for HEAD
-    return InterlockedCompareExchange(dest, exch,cmp);
-#else    
-    return ice_wrapper(&InterlockedCompareExchange, dest, exch, cmp);
-#endif
-}
-}
-#endif
-
 namespace boost {
 
-void call_once(void (*func)(), once_flag& flag)
+    void call_once(once_flag& flag, void (*func)())
 {
-#if defined(BOOST_HAS_WINTHREADS)
-    if (compare_exchange(&flag, 1, 1) == 0)
-    {
-#if defined(BOOST_NO_STRINGSTREAM)
-        std::ostrstream strm;
-        strm << "2AC1A572DB6944B0A65C38C4140AF2F4" 
-             << std::hex
-             << GetCurrentProcessId() 
-             << &flag 
-             << std::ends;
-        unfreezer unfreeze(strm);
-#   if defined (BOOST_NO_ANSI_APIS)
-        int const num_wide_chars = ::MultiByteToWideChar(CP_ACP, 0, strm.str(), -1, 0, 0);
-        LPWSTR const wide_name = (LPWSTR)_alloca( (num_wide_chars+1) * 2 );
-        int const res=::MultiByteToWideChar(CP_ACP, 0, name, -1, wide_name, num_wide_chars);
-        if(!res)
-            throw boost::thread_resource_error();
-        HANDLE mutex = CreateMutexW(NULL, FALSE, wide_name);
-#   else
-        HANDLE mutex = CreateMutexA(NULL, FALSE, strm.str());
-#   endif
-#else
-#   if defined (BOOST_NO_ANSI_APIS)
-        std::wostringstream strm;
-        strm << L"2AC1A572DB6944B0A65C38C4140AF2F4" 
-             << std::hex
-             << GetCurrentProcessId() 
-             << &flag;
-        HANDLE mutex = CreateMutexW(NULL, FALSE, strm.str().c_str());
-#   else
-        std::ostringstream strm;
-        strm << "2AC1A572DB6944B0A65C38C4140AF2F4" 
-             << std::hex
-             << GetCurrentProcessId() 
-             << &flag;
-        HANDLE mutex = CreateMutexA(NULL, FALSE, strm.str().c_str());
-#   endif
-#endif
-        assert(mutex != NULL);
-
-        int res = 0;
-        res = WaitForSingleObject(mutex, INFINITE);
-        assert(res == WAIT_OBJECT_0);
-
-        if (compare_exchange(&flag, 1, 1) == 0)
-        {
-            try
-            {
-                func();
-            }
-            catch (...)
-            {
-                res = ReleaseMutex(mutex);
-                assert(res);
-                res = CloseHandle(mutex);
-                assert(res);
-                throw;
-            }
-            InterlockedExchange(&flag, 1);
-        }
-
-        res = ReleaseMutex(mutex);
-        assert(res);
-        res = CloseHandle(mutex);
-        assert(res);
-    }
-#elif defined(BOOST_HAS_PTHREADS)
-    pthread_once(&once, &key_init);
-    pthread_setspecific(key, &func);
-    pthread_once(&flag, do_once);
-#elif defined(BOOST_HAS_MPTASKS)
     if(flag == false)
     {
         // all we do here is make a remote call to blue, as blue is not
@@ -209,10 +44,7 @@ void call_once(void (*func)(), once_flag& flag)
         MPRemoteCall(remote_call_proxy, &sData, kMPOwningProcessRemoteContext);
         assert(flag == true);
     }
+}
+
+}
 #endif
-}
-
-}
-
-// Change Log:
-//   1 Aug 01  WEKEMPF Initial version.
diff --git a/src/tss.cpp b/src/tss.cpp
index 5c77bb52..33f635b9 100644
--- a/src/tss.cpp
+++ b/src/tss.cpp
@@ -182,7 +182,7 @@ namespace boost {
 namespace detail {
 void tss::init(boost::function1<void, void*>* pcleanup)
 {
-    boost::call_once(&init_tss_data, tss_data_once);
+    boost::call_once(tss_data_once, &init_tss_data);
     if (tss_data_cleanup_handlers == 0)
         throw thread_resource_error();
     boost::mutex::scoped_lock lock(*tss_data_mutex);
diff --git a/src/tss_hooks.cpp b/src/tss_hooks.cpp
index be4bb097..ba7c1972 100644
--- a/src/tss_hooks.cpp
+++ b/src/tss_hooks.cpp
@@ -74,7 +74,7 @@
         thread_exit_handler exit_handler
         )
     {
-        boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+        boost::call_once(once_init_threadmon_mutex, init_threadmon_mutex);
         //boost::mutex::scoped_lock lock(*threadmon_mutex);
         CScopedCSLock lock(&threadmon_mutex);
 
@@ -141,7 +141,7 @@
 
     extern "C" BOOST_THREAD_DECL void on_process_enter(void)
     {
-        boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+        boost::call_once(once_init_threadmon_mutex, init_threadmon_mutex);
 //        boost::mutex::scoped_lock lock(*threadmon_mutex);
         CScopedCSLock lock(&threadmon_mutex);
 
@@ -150,7 +150,7 @@
 
     extern "C" BOOST_THREAD_DECL void on_process_exit(void)
     {
-        boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+        boost::call_once(once_init_threadmon_mutex, init_threadmon_mutex);
 //        boost::mutex::scoped_lock lock(*threadmon_mutex);
         CScopedCSLock lock(&threadmon_mutex);
 
@@ -173,7 +173,7 @@
 
     extern "C" BOOST_THREAD_DECL void on_thread_exit(void)
     {
-        boost::call_once(init_threadmon_mutex, once_init_threadmon_mutex);
+        boost::call_once(once_init_threadmon_mutex, init_threadmon_mutex);
 //        boost::mutex::scoped_lock lock(*threadmon_mutex);
         CScopedCSLock lock(&threadmon_mutex);
 
diff --git a/test/test_once.cpp b/test/test_once.cpp
index d5c6eb9a..f9f59b79 100644
--- a/test/test_once.cpp
+++ b/test/test_once.cpp
@@ -1,52 +1,61 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/thread/once.hpp>
-#include <boost/thread/thread.hpp>
+// (C) Copyright 2006-7 Anthony Williams
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/test/unit_test.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/once.hpp>
 
-#include <libs/thread/test/util.inl>
+boost::once_flag flag=BOOST_ONCE_INIT;
+int var_to_init=0;
+boost::mutex m;
 
-int once_value = 0;
-boost::once_flag once = BOOST_ONCE_INIT;
-
-void init_once_value()
+void initialize_variable()
 {
-    once_value++;
+    // ensure that if multiple threads get in here, they are serialized, so we can see the effect
+    boost::mutex::scoped_lock lock(m);
+    ++var_to_init;
 }
 
-void test_once_thread()
+void call_once_thread()
 {
-    boost::call_once(init_once_value, once);
+    unsigned const loop_count=100;
+    int my_once_value=0;
+    for(unsigned i=0;i<loop_count;++i)
+    {
+        boost::call_once(flag, initialize_variable);
+        my_once_value=var_to_init;
+        if(my_once_value!=1)
+        {
+            break;
+        }
+    }
+    boost::mutex::scoped_lock lock(m);
+    BOOST_CHECK_EQUAL(my_once_value, 1);
 }
 
-void do_test_once()
+void test_call_once()
 {
-    const int NUMTHREADS=5;
-    boost::thread_group threads;
-    for (int i=0; i<NUMTHREADS; ++i)
-        threads.create_thread(&test_once_thread);
-    threads.join_all();
-    BOOST_CHECK_EQUAL(once_value, 1);
+    unsigned const num_threads=100;
+    boost::thread_group group;
+    
+    for(unsigned i=0;i<num_threads;++i)
+    {
+        group.create_thread(&call_once_thread);
+    }
+    group.join_all();
+    BOOST_CHECK_EQUAL(var_to_init,1);
 }
 
-void test_once()
-{
-    timed_test(&do_test_once, 2);
-}
 
 boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
 {
     boost::unit_test_framework::test_suite* test =
-        BOOST_TEST_SUITE("Boost.Threads: once test suite");
+        BOOST_TEST_SUITE("Boost.Threads: call_once test suite");
 
-    test->add(BOOST_TEST_CASE(test_once));
+    test->add(BOOST_TEST_CASE(test_call_once));
 
     return test;
 }

From a8be12940ec5e93d229e2993b92acbce420260f3 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Fri, 5 Oct 2007 12:20:50 +0000
Subject: [PATCH 03/16] added platform-specific call_once implementations

[SVN r39702]
---
 include/boost/thread/pthread/once.hpp         |  74 +++++++
 .../boost/thread/win32/interlocked_read.hpp   |  36 ++++
 include/boost/thread/win32/once.hpp           | 132 ++++++++++++
 .../boost/thread/win32/thread_primitives.hpp  | 198 ++++++++++++++++++
 4 files changed, 440 insertions(+)
 create mode 100644 include/boost/thread/pthread/once.hpp
 create mode 100644 include/boost/thread/win32/interlocked_read.hpp
 create mode 100644 include/boost/thread/win32/once.hpp
 create mode 100644 include/boost/thread/win32/thread_primitives.hpp

diff --git a/include/boost/thread/pthread/once.hpp b/include/boost/thread/pthread/once.hpp
new file mode 100644
index 00000000..cd88f35f
--- /dev/null
+++ b/include/boost/thread/pthread/once.hpp
@@ -0,0 +1,74 @@
+#ifndef BOOST_THREAD_PTHREAD_ONCE_HPP
+#define BOOST_THREAD_PTHREAD_ONCE_HPP
+
+//  once.hpp
+//
+//  (C) Copyright 2007 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/thread/pthread/config.hpp>
+
+#include <pthread.h>
+#include <boost/assert.hpp>
+
+namespace boost {
+
+    struct once_flag
+    {
+        pthread_mutex_t mutex;
+        unsigned flag;
+    };
+
+#define BOOST_ONCE_INIT {PTHREAD_MUTEX_INITIALIZER,0}
+
+    namespace detail
+    {
+        struct pthread_mutex_scoped_lock
+        {
+            pthread_mutex_t * mutex;
+            
+            explicit pthread_mutex_scoped_lock(pthread_mutex_t* mutex_):
+                mutex(mutex_)
+            {
+                int const res=pthread_mutex_lock(mutex);
+                BOOST_ASSERT(!res);
+            }
+            ~pthread_mutex_scoped_lock()
+            {
+                int const res=pthread_mutex_unlock(mutex);
+                BOOST_ASSERT(!res);
+            }
+        };
+    }
+
+    template<typename Function>
+    void call_once(once_flag& flag,Function f)
+    {
+        long const function_complete_flag_value=0xc15730e2;
+
+#ifdef BOOST_PTHREAD_HAS_ATOMICS
+        if(::boost::detail::interlocked_read_acquire(&flag.flag)!=function_complete_flag_value)
+        {
+#endif
+            detail::pthread_mutex_scoped_lock const lock(&flag.mutex);
+            if(flag.flag!=function_complete_flag_value)
+            {
+                f();
+#ifdef BOOST_PTHREAD_HAS_ATOMICS
+                ::boost::detail::interlocked_write_release(&flag.flag,function_complete_flag_value);
+#else
+                flag.flag=function_complete_flag_value;
+#endif
+            }
+#ifdef BOOST_PTHREAD_HAS_ATOMICS
+        }
+#endif
+    }
+    
+
+}
+
+#endif
diff --git a/include/boost/thread/win32/interlocked_read.hpp b/include/boost/thread/win32/interlocked_read.hpp
new file mode 100644
index 00000000..98f0b3e6
--- /dev/null
+++ b/include/boost/thread/win32/interlocked_read.hpp
@@ -0,0 +1,36 @@
+#ifndef BOOST_THREAD_DETAIL_INTERLOCKED_READ_WIN32_HPP
+#define BOOST_THREAD_DETAIL_INTERLOCKED_READ_WIN32_HPP
+
+//  interlocked_read_win32.hpp
+//
+//  (C) Copyright 2005-7 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/detail/interlocked.hpp>
+
+extern "C" void _ReadWriteBarrier(void);
+#pragma intrinsic(_ReadWriteBarrier)
+
+namespace boost
+{
+    namespace detail
+    {
+        inline long interlocked_read_acquire(long volatile* x)
+        {
+            long const res=*x;
+            _ReadWriteBarrier();
+            return res;
+        }
+        inline void* interlocked_read_acquire(void* volatile* x)
+        {
+            void* const res=*x;
+            _ReadWriteBarrier();
+            return res;
+        }
+    }
+}
+
+#endif
diff --git a/include/boost/thread/win32/once.hpp b/include/boost/thread/win32/once.hpp
new file mode 100644
index 00000000..9a79d331
--- /dev/null
+++ b/include/boost/thread/win32/once.hpp
@@ -0,0 +1,132 @@
+#ifndef BOOST_THREAD_WIN32_ONCE_HPP
+#define BOOST_THREAD_WIN32_ONCE_HPP
+
+//  once.hpp
+//
+//  (C) Copyright 2005-7 Anthony Williams 
+//  (C) Copyright 2005 John Maddock
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include <cstring>
+#include <cstddef>
+#include <boost/assert.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/detail/interlocked.hpp>
+#include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/thread/win32/interlocked_read.hpp>
+
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std
+{
+    using ::memcpy;
+    using ::ptrdiff_t;
+}
+#endif
+
+namespace boost
+{
+    typedef long once_flag;
+
+#define BOOST_ONCE_INIT 0
+
+    namespace detail
+    {
+        struct win32_mutex_scoped_lock
+        {
+            void* const mutex_handle;
+            explicit win32_mutex_scoped_lock(void* mutex_handle_):
+                mutex_handle(mutex_handle_)
+            {
+                unsigned long const res=win32::WaitForSingleObject(mutex_handle,win32::infinite);
+                BOOST_ASSERT(!res);
+            }
+            ~win32_mutex_scoped_lock()
+            {
+                bool const success=win32::ReleaseMutex(mutex_handle)!=0;
+                BOOST_ASSERT(success);
+            }
+        };
+
+#ifdef BOOST_NO_ANSI_APIS
+        template <class I>
+        void int_to_string(I p, wchar_t* buf)
+        {
+            for(unsigned i=0; i < sizeof(I)*2; ++i,++buf)
+            {
+                *buf = L'A' + static_cast<wchar_t>((p >> (i*4)) & 0x0f);
+            }
+            *buf = 0;
+        }
+#else
+        template <class I>
+        void int_to_string(I p, char* buf)
+        {
+            for(unsigned i=0; i < sizeof(I)*2; ++i,++buf)
+            {
+                *buf = 'A' + static_cast<char>((p >> (i*4)) & 0x0f);
+            }
+            *buf = 0;
+        }
+#endif
+
+        // create a named mutex. It doesn't really matter what this name is
+        // as long as it is unique both to this process, and to the address of "flag":
+        inline void* create_once_mutex(void* flag_address)
+        {
+        
+#ifdef BOOST_NO_ANSI_APIS
+            typedef wchar_t char_type;
+            static const char_type fixed_mutex_name[]=L"{C15730E2-145C-4c5e-B005-3BC753F42475}-once-flag";
+#else
+            typedef char char_type;
+            static const char_type fixed_mutex_name[]="{C15730E2-145C-4c5e-B005-3BC753F42475}-once-flag";
+#endif
+            unsigned const once_mutex_name_fixed_buffer_size=sizeof(fixed_mutex_name)/sizeof(char_type);
+            unsigned const once_mutex_name_fixed_length=once_mutex_name_fixed_buffer_size-1;
+            unsigned const once_mutex_name_length=once_mutex_name_fixed_buffer_size+sizeof(void*)*2+sizeof(unsigned long)*2;
+            char_type mutex_name[once_mutex_name_length];
+            
+            std::memcpy(mutex_name,fixed_mutex_name,sizeof(fixed_mutex_name));
+
+            BOOST_STATIC_ASSERT(sizeof(void*) == sizeof(std::ptrdiff_t));
+            detail::int_to_string(reinterpret_cast<std::ptrdiff_t>(flag_address), mutex_name + once_mutex_name_fixed_length);
+            detail::int_to_string(win32::GetCurrentProcessId(), mutex_name + once_mutex_name_fixed_length + sizeof(void*)*2);
+
+#ifdef BOOST_NO_ANSI_APIS
+            return win32::CreateMutexW(NULL, 0, mutex_name);
+#else
+            return win32::CreateMutexA(NULL, 0, mutex_name);
+#endif
+        }
+
+        
+    }
+    
+
+    template<typename Function>
+    void call_once(once_flag& flag,Function f)
+    {
+        // Try for a quick win: if the procedure has already been called
+        // just skip through:
+        long const function_complete_flag_value=0xc15730e2;
+
+        if(::boost::detail::interlocked_read_acquire(&flag)!=function_complete_flag_value)
+        {
+            void* const mutex_handle(::boost::detail::create_once_mutex(&flag));
+            BOOST_ASSERT(mutex_handle);
+            detail::win32::handle_manager const closer(mutex_handle);
+            detail::win32_mutex_scoped_lock const lock(mutex_handle);
+      
+            if(flag!=function_complete_flag_value)
+            {
+                f();
+                BOOST_INTERLOCKED_EXCHANGE(&flag,function_complete_flag_value);
+            }
+        }
+    }
+}
+
+#endif
diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
new file mode 100644
index 00000000..2213c7b8
--- /dev/null
+++ b/include/boost/thread/win32/thread_primitives.hpp
@@ -0,0 +1,198 @@
+#ifndef BOOST_WIN32_THREAD_PRIMITIVES_HPP
+#define BOOST_WIN32_THREAD_PRIMITIVES_HPP
+
+//  win32_thread_primitives.hpp
+//
+//  (C) Copyright 2005-6 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/config.hpp>
+#include <boost/assert.hpp>
+#include <boost/thread/exceptions.hpp>
+
+#if defined( BOOST_USE_WINDOWS_H )
+# include <windows.h>
+namespace boost
+{
+    namespace detail
+    {
+        namespace win32
+        {
+            typedef ULONG_PTR ulong_ptr;
+            typedef HANDLE handle;
+            unsigned const infinite=INFINITE;
+            unsigned const timeout=WAIT_TIMEOUT;
+
+            using ::CreateMutexA;
+            using ::CreateEventA;
+            using ::CreateSemaphoreA;
+            using ::CloseHandle;
+            using ::ReleaseMutex;
+            using ::ReleaseSemaphore;
+            using ::SetEvent;
+            using ::ResetEvent;
+            using ::WaitForMultipleObjects;
+            using ::WaitForSingleObject;
+            using ::GetCurrentProcessId;
+            using ::GetCurrentThreadId;
+            using ::GetCurrentThread;
+            using ::GetCurrentProcess;
+            using ::DuplicateHandle;
+            using ::SleepEx;
+            using ::QueueUserAPC;
+        }
+    }
+}
+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+namespace boost
+{
+    namespace detail
+    {
+        namespace win32
+        {
+            
+# ifdef _WIN64
+            typedef unsigned __int64 ulong_ptr;
+# else
+            typedef unsigned long ulong_ptr;
+# endif
+            typedef void* handle;
+            unsigned const infinite=~0U;
+            unsigned const timeout=258U;
+
+            extern "C"
+            {
+                struct _SECURITY_ATTRIBUTES;
+                __declspec(dllimport) void* __stdcall CreateMutexA(_SECURITY_ATTRIBUTES*,int,char const*);
+                __declspec(dllimport) void* __stdcall CreateSemaphoreA(_SECURITY_ATTRIBUTES*,long,long,char const*);
+                __declspec(dllimport) void* __stdcall CreateEventA(_SECURITY_ATTRIBUTES*,int,int,char const*);
+                __declspec(dllimport) int __stdcall CloseHandle(void*);
+                __declspec(dllimport) int __stdcall ReleaseMutex(void*);
+                __declspec(dllimport) unsigned long __stdcall GetCurrentProcessId();
+                __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId();
+                __declspec(dllimport) unsigned long __stdcall WaitForSingleObject(void*,unsigned long);
+                __declspec(dllimport) int __stdcall ReleaseSemaphore(void*,long,long*);
+                __declspec(dllimport) void* __stdcall GetCurrentThread();
+                __declspec(dllimport) void* __stdcall GetCurrentProcess();
+                __declspec(dllimport) int __stdcall DuplicateHandle(void*,void*,void*,void**,unsigned long,int,unsigned long);
+                __declspec(dllimport) unsigned long __stdcall SleepEx(unsigned long,int);
+                typedef void (__stdcall *queue_user_apc_callback_function)(ulong_ptr);
+                __declspec(dllimport) unsigned long __stdcall QueueUserAPC(queue_user_apc_callback_function,void*,ulong_ptr);
+                __declspec(dllimport) int __stdcall SetEvent(void*);
+                __declspec(dllimport) int __stdcall ResetEvent(void*);
+                __declspec(dllimport) unsigned long __stdcall WaitForMultipleObjects(unsigned long nCount,void* const * lpHandles,int bWaitAll,unsigned long dwMilliseconds);
+            }
+        }
+    }
+}
+#else
+# error "Win32 functions not available"
+#endif
+
+namespace boost
+{
+    namespace detail
+    {
+        namespace win32
+        {
+            enum event_type
+            {
+                auto_reset_event=false,
+                manual_reset_event=true
+            };
+            
+            enum initial_event_state
+            {
+                event_initially_reset=false,
+                event_initially_set=true
+            };
+            
+            inline handle create_anonymous_event(event_type type,initial_event_state state)
+            {
+                handle const res=CreateEventA(0,type,state,0);
+                return res?res:throw thread_resource_error();
+            }
+
+            inline handle create_anonymous_semaphore(long initial_count,long max_count)
+            {
+                handle const res=CreateSemaphoreA(NULL,initial_count,max_count,NULL);
+                return res?res:throw thread_resource_error();
+            }
+
+            inline handle duplicate_handle(handle source)
+            {
+                handle const current_process=GetCurrentProcess();
+                long const same_access_flag=2;
+                handle new_handle=0;
+                bool const success=DuplicateHandle(current_process,source,current_process,&new_handle,0,false,same_access_flag)!=0;
+                return success?new_handle:throw thread_resource_error();
+            }
+
+            inline void release_semaphore(handle semaphore,long count)
+            {
+                bool const success=ReleaseSemaphore(semaphore,count,0)!=0;
+                BOOST_ASSERT(success);
+            }
+
+            class handle_manager
+            {
+            private:
+                handle handle_to_manage;
+                handle_manager(handle_manager&);
+                handle_manager& operator=(handle_manager&);
+
+                void cleanup()
+                {
+                    if(handle_to_manage)
+                    {
+                        unsigned long result=CloseHandle(handle_to_manage);
+                        BOOST_ASSERT(result);
+                    }
+                }
+                
+            public:
+                explicit handle_manager(handle handle_to_manage_):
+                    handle_to_manage(handle_to_manage_)
+                {}
+                handle_manager():
+                    handle_to_manage(0)
+                {}
+                
+                handle_manager& operator=(handle new_handle)
+                {
+                    cleanup();
+                    handle_to_manage=new_handle;
+                }
+
+                operator handle() const
+                {
+                    return handle_to_manage;
+                }
+
+                handle release()
+                {
+                    handle const res=handle_to_manage;
+                    handle_to_manage=0;
+                    return res;
+                }
+
+                bool operator!() const
+                {
+                    return !handle_to_manage;
+                }
+                
+                ~handle_manager()
+                {
+                    cleanup();
+                }
+            };
+            
+        }
+    }
+}
+
+
+#endif

From 1c6dfda83c9aa95d3672457e95f39caed486621b Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Fri, 5 Oct 2007 12:21:55 +0000
Subject: [PATCH 04/16] added platform dispatcher

[SVN r39703]
---
 include/boost/thread/detail/platform.hpp | 72 ++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 include/boost/thread/detail/platform.hpp

diff --git a/include/boost/thread/detail/platform.hpp b/include/boost/thread/detail/platform.hpp
new file mode 100644
index 00000000..b49a5208
--- /dev/null
+++ b/include/boost/thread/detail/platform.hpp
@@ -0,0 +1,72 @@
+// Copyright 2006 Roland Schwarz.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// This work is a reimplementation along the design and ideas
+// of William E. Kempf.
+
+#ifndef BOOST_THREAD_RS06040501_HPP
+#define BOOST_THREAD_RS06040501_HPP
+
+// fetch compiler and platform configuration
+#include <boost/config.hpp>
+
+// insist on threading support being available:
+#include <boost/config/requires_threads.hpp>
+
+// choose platform
+#if defined(linux) || defined(__linux) || defined(__linux__)
+#  define BOOST_THREAD_LINUX
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#  define BOOST_THREAD_BSD
+#elif defined(sun) || defined(__sun)
+#  define BOOST_THREAD_SOLARIS
+#elif defined(__sgi)
+#  define BOOST_THREAD_IRIX
+#elif defined(__hpux)
+#  define BOOST_THREAD_HPUX
+#elif defined(__CYGWIN__)
+#  define BOOST_THREAD_CYGWIN
+#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#  define BOOST_THREAD_WIN32
+#elif defined(__BEOS__)
+#  define BOOST_THREAD_BEOS
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+#  define BOOST_THREAD_MACOS
+#elif defined(__IBMCPP__) || defined(_AIX)
+#  define BOOST_THREAD_AIX
+#elif defined(__amigaos__)
+#  define BOOST_THREAD_AMIGAOS
+#elif defined(__QNXNTO__)
+#  define BOOST_THREAD_QNXNTO
+#elif defined(unix) || defined(__unix) || defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE)
+#	if defined(BOOST_HAS_PTHREADS) && !defined(BOOST_THREAD_POSIX)
+#		define BOOST_THREAD_POSIX
+#	endif
+#endif
+
+// For every supported platform add a new entry into the dispatch table below.
+// BOOST_THREAD_POSIX is tested first, so on platforms where posix and native
+// threading is available, the user may choose, by defining BOOST_THREAD_POSIX
+// in her source. If a platform is known to support pthreads and no native
+// port of boost_thread is available just specify "pthread" in the
+// dispatcher table. If there is no entry for a platform but pthreads is
+// available on the platform, pthread is choosen as default. If nothing is
+// available the preprocessor will fail with a diagnostic message.
+ 
+#if defined(BOOST_THREAD_POSIX)
+#  define BOOST_THREAD_PPFX pthread
+#else
+#  if defined(BOOST_THREAD_WIN32)
+#       define BOOST_THREAD_PPFX win32
+#  elif defined(BOOST_HAS_PTHREADS)
+#       define BOOST_THREAD_PPFX pthread
+#  else
+#       error "Sorry, no boost threads are available for this platform."
+#  endif
+#endif
+
+#define BOOST_THREAD_PLATFORM(header) <boost/thread/BOOST_THREAD_PPFX/header>
+
+#endif // BOOST_THREAD_RS06040501_HPP

From 9590526430b2c65b06b196a65b5f333a248820d1 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Fri, 5 Oct 2007 12:50:29 +0000
Subject: [PATCH 05/16] include config header from right place for
 pthread/once.hpp

[SVN r39705]
---
 build/Jamfile.v2                      | 2 +-
 include/boost/thread/pthread/once.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index cc97011b..2aadaf36 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -18,7 +18,7 @@ CPP_SOURCES =
         condition
         exceptions
         mutex
-        once
+#        once
         recursive_mutex
 #        read_write_mutex
         thread
diff --git a/include/boost/thread/pthread/once.hpp b/include/boost/thread/pthread/once.hpp
index cd88f35f..8453569f 100644
--- a/include/boost/thread/pthread/once.hpp
+++ b/include/boost/thread/pthread/once.hpp
@@ -9,7 +9,7 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/thread/pthread/config.hpp>
+#include <boost/thread/detail/config.hpp>
 
 #include <pthread.h>
 #include <boost/assert.hpp>

From 5d4678364e17e945f5c5a09814496de809de04ee Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Mon, 8 Oct 2007 07:18:27 +0000
Subject: [PATCH 06/16] Use InterlockedCompareExchange when _ReadWriteBarrier
 not available

[SVN r39777]
---
 .../boost/thread/win32/interlocked_read.hpp   | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/boost/thread/win32/interlocked_read.hpp b/include/boost/thread/win32/interlocked_read.hpp
index 98f0b3e6..77a333ba 100644
--- a/include/boost/thread/win32/interlocked_read.hpp
+++ b/include/boost/thread/win32/interlocked_read.hpp
@@ -9,7 +9,7 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/detail/interlocked.hpp>
+#ifdef BOOST_MSVC
 
 extern "C" void _ReadWriteBarrier(void);
 #pragma intrinsic(_ReadWriteBarrier)
@@ -33,4 +33,26 @@ namespace boost
     }
 }
 
+#else
+
+#include <boost/detail/interlocked.hpp>
+
+namespace boost
+{
+    namespace detail
+    {
+        inline long interlocked_read_acquire(long volatile* x)
+        {
+            return BOOST_INTERLOCKED_COMPARE_EXCHANGE(x,0,0);
+        }
+        inline void* interlocked_read_acquire(void* volatile* x)
+        {
+            return BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(x,0,0);
+        }
+    }
+}
+
+#endif
+
+
 #endif

From b15b2e666f7a4d21a129c7244462d947d2e98402 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Mon, 8 Oct 2007 09:48:57 +0000
Subject: [PATCH 07/16] added extended test for new call_once

[SVN r39780]
---
 test/test_once.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/test/test_once.cpp b/test/test_once.cpp
index f9f59b79..b57bf5d5 100644
--- a/test/test_once.cpp
+++ b/test/test_once.cpp
@@ -49,6 +49,54 @@ void test_call_once()
     BOOST_CHECK_EQUAL(var_to_init,1);
 }
 
+int var_to_init_with_functor=0;
+
+struct increment_value
+{
+    int* value;
+    explicit increment_value(int* value_):
+        value(value_)
+    {}
+    
+    void operator()() const
+    {
+        boost::mutex::scoped_lock lock(m);
+        ++(*value);
+    }
+};
+
+void call_once_with_functor()
+{
+    unsigned const loop_count=100;
+    int my_once_value=0;
+    static boost::once_flag functor_flag=BOOST_ONCE_INIT;
+    for(unsigned i=0;i<loop_count;++i)
+    {
+        boost::call_once(functor_flag, increment_value(&var_to_init_with_functor));
+        my_once_value=var_to_init_with_functor;
+        if(my_once_value!=1)
+        {
+            break;
+        }
+    }
+    boost::mutex::scoped_lock lock(m);
+    BOOST_CHECK_EQUAL(my_once_value, 1);
+}
+
+
+void test_call_once_arbitrary_functor()
+{
+    unsigned const num_threads=100;
+    boost::thread_group group;
+
+    for(unsigned i=0;i<num_threads;++i)
+    {
+        group.create_thread(&call_once_with_functor);
+    }
+    group.join_all();
+    BOOST_CHECK_EQUAL(var_to_init_with_functor,1);
+}
+
 
 boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
 {
@@ -56,6 +104,7 @@ boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
         BOOST_TEST_SUITE("Boost.Threads: call_once test suite");
 
     test->add(BOOST_TEST_CASE(test_call_once));
+    test->add(BOOST_TEST_CASE(test_call_once_arbitrary_functor));
 
     return test;
 }

From a706d1df00a73750619eeeaf35f66703b0f7a131 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Mon, 8 Oct 2007 09:55:56 +0000
Subject: [PATCH 08/16] call_once passes exceptions to caller and leaves flag
 unset

[SVN r39781]
---
 test/test_once.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/test/test_once.cpp b/test/test_once.cpp
index b57bf5d5..eb9510d8 100644
--- a/test/test_once.cpp
+++ b/test/test_once.cpp
@@ -83,7 +83,6 @@ void call_once_with_functor()
     BOOST_CHECK_EQUAL(my_once_value, 1);
 }
 
-
 void test_call_once_arbitrary_functor()
 {
     unsigned const num_threads=100;
@@ -98,6 +97,56 @@ void test_call_once_arbitrary_functor()
 }
 
 
+struct throw_before_third_pass
+{
+    struct my_exception
+    {};
+
+    static unsigned pass_counter;
+    
+    void operator()() const
+    {
+        boost::mutex::scoped_lock lock(m);
+        ++pass_counter;
+        if(pass_counter<3)
+        {
+            throw my_exception();
+        }
+    }
+};
+
+unsigned throw_before_third_pass::pass_counter=0;
+unsigned exception_counter=0;
+
+void call_once_with_exception()
+{
+    static boost::once_flag functor_flag=BOOST_ONCE_INIT;
+    try
+    {
+        boost::call_once(functor_flag, throw_before_third_pass());
+    }
+    catch(throw_before_third_pass::my_exception)
+    {
+        boost::mutex::scoped_lock lock(m);
+        ++exception_counter;
+    }
+}
+
+void test_call_once_retried_on_exception()
+{
+    unsigned const num_threads=100;
+    boost::thread_group group;
+
+    for(unsigned i=0;i<num_threads;++i)
+    {
+        group.create_thread(&call_once_with_exception);
+    }
+    group.join_all();
+    BOOST_CHECK_EQUAL(throw_before_third_pass::pass_counter,3);
+    BOOST_CHECK_EQUAL(exception_counter,2);
+}
+
+
 boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
 {
     boost::unit_test_framework::test_suite* test =
@@ -105,6 +154,7 @@ boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
 
     test->add(BOOST_TEST_CASE(test_call_once));
     test->add(BOOST_TEST_CASE(test_call_once_arbitrary_functor));
+    test->add(BOOST_TEST_CASE(test_call_once_retried_on_exception));
 
     return test;
 }

From 9d4c55161a70c20aa81c009ade0bad2703274179 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Mon, 8 Oct 2007 15:41:05 +0000
Subject: [PATCH 09/16] New mutex implementations, more akin to C++0x

[SVN r39784]
---
 build/Jamfile.v2                              |   4 +-
 include/boost/thread/condition.hpp            |  48 +-
 include/boost/thread/locks.hpp                | 486 ++++++++++++++++++
 include/boost/thread/mutex.hpp                | 177 +------
 include/boost/thread/pthread/mutex.hpp        | 216 ++++++++
 .../boost/thread/pthread/recursive_mutex.hpp  | 276 ++++++++++
 include/boost/thread/pthread/timespec.hpp     |  23 +
 include/boost/thread/recursive_mutex.hpp      | 191 +------
 include/boost/thread/thread_time.hpp          |  40 ++
 .../thread/win32/basic_recursive_mutex.hpp    | 120 +++++
 .../boost/thread/win32/basic_timed_mutex.hpp  | 157 ++++++
 include/boost/thread/win32/mutex.hpp          |  61 +++
 .../boost/thread/win32/recursive_mutex.hpp    |  61 +++
 .../boost/thread/win32/thread_primitives.hpp  |  18 +-
 src/condition.cpp                             |  13 +
 src/thread.cpp                                |   1 +
 test/test_mutex.cpp                           |  18 +-
 17 files changed, 1524 insertions(+), 386 deletions(-)
 create mode 100644 include/boost/thread/locks.hpp
 create mode 100644 include/boost/thread/pthread/mutex.hpp
 create mode 100644 include/boost/thread/pthread/recursive_mutex.hpp
 create mode 100644 include/boost/thread/pthread/timespec.hpp
 create mode 100644 include/boost/thread/thread_time.hpp
 create mode 100644 include/boost/thread/win32/basic_recursive_mutex.hpp
 create mode 100644 include/boost/thread/win32/basic_timed_mutex.hpp
 create mode 100644 include/boost/thread/win32/mutex.hpp
 create mode 100644 include/boost/thread/win32/recursive_mutex.hpp

diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 2aadaf36..961e01e8 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -17,9 +17,9 @@ CPP_SOURCES =
         barrier
         condition
         exceptions
-        mutex
+#        mutex
 #        once
-        recursive_mutex
+#        recursive_mutex
 #        read_write_mutex
         thread
         tss_hooks
diff --git a/include/boost/thread/condition.hpp b/include/boost/thread/condition.hpp
index e5a1c317..64889d56 100644
--- a/include/boost/thread/condition.hpp
+++ b/include/boost/thread/condition.hpp
@@ -1,5 +1,6 @@
 // Copyright (C) 2001-2003
 // William E. Kempf
+// Copyright (C) 2007 Anthony Williams
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying 
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -61,6 +62,7 @@ public:
                         // still waiting to be removed from m_queue
 #elif defined(BOOST_HAS_PTHREADS)
     pthread_cond_t m_condition;
+    pthread_mutex_t m_mutex;
 #elif defined(BOOST_HAS_MPTASKS)
     MPSemaphoreID m_gate;
     MPSemaphoreID m_queue;
@@ -90,7 +92,7 @@ public:
         if (!lock)
             throw lock_error();
 
-        do_wait(lock.m_mutex);
+        do_wait(*lock.mutex());
     }
 
     template <typename L, typename Pr>
@@ -100,7 +102,7 @@ public:
             throw lock_error();
 
         while (!pred())
-            do_wait(lock.m_mutex);
+            do_wait(*lock.mutex());
     }
 
     template <typename L>
@@ -109,7 +111,7 @@ public:
         if (!lock)
             throw lock_error();
 
-        return do_timed_wait(lock.m_mutex, xt);
+        return do_timed_wait(*lock.mutex(), xt);
     }
 
     template <typename L, typename Pr>
@@ -120,7 +122,7 @@ public:
 
         while (!pred())
         {
-            if (!do_timed_wait(lock.m_mutex, xt))
+            if (!do_timed_wait(*lock.mutex(), xt))
                 return false;
         }
 
@@ -135,25 +137,22 @@ private:
     {
 #if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
         m_impl.enter_wait();
+#else
+        pthread_mutex_lock(&m_impl.m_mutex);
 #endif
 
-        typedef detail::thread::lock_ops<M>
-#if defined(__HP_aCC) && __HP_aCC <= 33900 && !defined(BOOST_STRICT_CONFIG)
-# define lock_ops lock_ops_  // HP confuses lock_ops witht the template
-#endif
-            lock_ops;
-
-        typename lock_ops::lock_state state;
-        lock_ops::unlock(mutex, state);
+        mutex.unlock();
 
 #if defined(BOOST_HAS_PTHREADS)
-        m_impl.do_wait(state.pmutex);
+        m_impl.do_wait(&m_impl.m_mutex);
 #elif (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
         m_impl.do_wait();
 #endif
 
-        lock_ops::lock(mutex, state);
-#undef lock_ops
+#if defined(BOOST_HAS_PTHREADS)
+        pthread_mutex_unlock(&m_impl.m_mutex);
+#endif
+        mutex.lock();
     }
 
     template <typename M>
@@ -161,27 +160,24 @@ private:
     {
 #if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
         m_impl.enter_wait();
+#else
+        pthread_mutex_lock(&m_impl.m_mutex);
 #endif
 
-        typedef detail::thread::lock_ops<M>
-#if defined(__HP_aCC) && __HP_aCC <= 33900 && !defined(BOOST_STRICT_CONFIG)
-# define lock_ops lock_ops_  // HP confuses lock_ops witht the template
-#endif
-            lock_ops;
-
-        typename lock_ops::lock_state state;
-        lock_ops::unlock(mutex, state);
+        mutex.unlock();
 
         bool ret = false;
 
 #if defined(BOOST_HAS_PTHREADS)
-        ret = m_impl.do_timed_wait(xt, state.pmutex);
+        ret = m_impl.do_timed_wait(xt, &m_impl.m_mutex);
 #elif (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
         ret = m_impl.do_timed_wait(xt);
 #endif
 
-        lock_ops::lock(mutex, state);
-#undef lock_ops
+#if defined(BOOST_HAS_PTHREADS)
+        pthread_mutex_unlock(&m_impl.m_mutex);
+#endif
+        mutex.lock();
 
         return ret;
     }
diff --git a/include/boost/thread/locks.hpp b/include/boost/thread/locks.hpp
new file mode 100644
index 00000000..258b0f60
--- /dev/null
+++ b/include/boost/thread/locks.hpp
@@ -0,0 +1,486 @@
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// (C) Copyright 2007 Anthony Williams
+#ifndef BOOST_THREAD_LOCKS_HPP
+#define BOOST_THREAD_LOCKS_HPP
+#include <boost/thread/detail/config.hpp>
+#include <boost/thread/exceptions.hpp>
+#include <boost/thread/detail/move.hpp>
+#include <algorithm>
+#include <boost/thread/thread_time.hpp>
+
+namespace boost
+{
+    struct defer_lock_t
+    {};
+    struct try_to_lock_t
+    {};
+    struct adopt_lock_t
+    {};
+    
+    const defer_lock_t defer_lock={};
+    const try_to_lock_t try_to_lock={};
+    const adopt_lock_t adopt_lock={};
+
+    template<typename Mutex>
+    class shareable_lock;
+
+    template<typename Mutex>
+    class exclusive_lock;
+
+    template<typename Mutex>
+    class upgradeable_lock;
+
+    template<typename Mutex>
+    class lock_guard
+    {
+    private:
+        Mutex& m;
+
+        explicit lock_guard(lock_guard&);
+        lock_guard& operator=(lock_guard&);
+    public:
+        explicit lock_guard(Mutex& m_):
+            m(m_)
+        {
+            m.lock();
+        }
+        lock_guard(Mutex& m_,adopt_lock_t):
+            m(m_)
+        {}
+        ~lock_guard()
+        {
+            m.unlock();
+        }
+    };
+
+
+    template<typename Mutex>
+    class unique_lock
+    {
+    private:
+        Mutex* m;
+        bool is_locked;
+        explicit unique_lock(unique_lock&);
+        unique_lock& operator=(unique_lock&);
+    public:
+        explicit unique_lock(Mutex& m_):
+            m(&m_),is_locked(false)
+        {
+            lock();
+        }
+        unique_lock(Mutex& m_,adopt_lock_t):
+            m(&m_),is_locked(true)
+        {}
+        unique_lock(Mutex& m_,defer_lock_t):
+            m(&m_),is_locked(false)
+        {}
+        unique_lock(Mutex& m_,try_to_lock_t):
+            m(&m_),is_locked(false)
+        {
+            try_lock();
+        }
+        unique_lock(Mutex& m_,system_time const& target_time):
+            m(&m_),is_locked(false)
+        {
+            timed_lock(target_time);
+        }
+        unique_lock(boost::move_t<unique_lock> other):
+            m(other->m),is_locked(other->is_locked)
+        {
+            other->is_locked=false;
+        }
+        unique_lock(boost::move_t<upgradeable_lock<Mutex> > other);
+
+        unique_lock& operator=(boost::move_t<unique_lock> other)
+        {
+            unique_lock temp(other);
+            swap(temp);
+            return *this;
+        }
+
+        unique_lock& operator=(boost::move_t<upgradeable_lock<Mutex> > other)
+        {
+            unique_lock temp(other);
+            swap(temp);
+            return *this;
+        }
+
+        void swap(unique_lock& other)
+        {
+            std::swap(m,other.m);
+            std::swap(is_locked,other.is_locked);
+        }
+        void swap(boost::move_t<unique_lock> other)
+        {
+            std::swap(m,other->m);
+            std::swap(is_locked,other->is_locked);
+        }
+        
+        ~unique_lock()
+        {
+            if(owns_lock())
+            {
+                m->unlock();
+            }
+        }
+        void lock()
+        {
+            if(owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            m->lock();
+            is_locked=true;
+        }
+        bool try_lock()
+        {
+            if(owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            is_locked=m->try_lock();
+            return is_locked;
+        }
+        template<typename TimeDuration>
+        bool timed_lock(TimeDuration const& relative_time)
+        {
+            is_locked=m->timed_lock(relative_time);
+            return is_locked;
+        }
+        
+        bool timed_lock(::boost::system_time const& absolute_time)
+        {
+            is_locked=m->timed_lock(absolute_time);
+            return is_locked;
+        }
+        void unlock()
+        {
+            if(!owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            m->unlock();
+            is_locked=false;
+        }
+            
+        typedef void (unique_lock::*bool_type)();
+        operator bool_type() const
+        {
+            return is_locked?&unique_lock::lock:0;
+        }
+        bool owns_lock() const
+        {
+            return is_locked;
+        }
+
+        Mutex* mutex() const
+        {
+            return m;
+        }
+
+        Mutex* release()
+        {
+            Mutex* const res=m;
+            m=0;
+            is_locked=false;
+            return res;
+        }
+
+        friend class shareable_lock<Mutex>;
+        friend class upgradeable_lock<Mutex>;
+    };
+
+    template<typename Mutex>
+    class shareable_lock
+    {
+    protected:
+        Mutex* m;
+        bool is_locked;
+    private:
+        explicit shareable_lock(shareable_lock&);
+        shareable_lock& operator=(shareable_lock&);
+    public:
+        explicit shareable_lock(Mutex& m_):
+            m(&m_),is_locked(false)
+        {
+            lock();
+        }
+        shareable_lock(Mutex& m_,bool do_lock):
+            m(&m_),is_locked(false)
+        {
+            if(do_lock)
+            {
+                lock();
+            }
+        }
+        shareable_lock(boost::move_t<shareable_lock> other):
+            m(other->m),is_locked(other->is_locked)
+        {
+            other->is_locked=false;
+        }
+
+        shareable_lock(boost::move_t<unique_lock<Mutex> > other):
+            m(other->m),is_locked(other->is_locked)
+        {
+            other->is_locked=false;
+            if(is_locked)
+            {
+                m->unlock_and_lock_shareable();
+            }
+        }
+
+        shareable_lock(boost::move_t<upgradeable_lock<Mutex> > other):
+            m(other->m),is_locked(other->is_locked)
+        {
+            other->is_locked=false;
+            if(is_locked)
+            {
+                m->unlock_upgradeable_and_lock_shareable();
+            }
+        }
+
+        shareable_lock& operator=(boost::move_t<shareable_lock> other)
+        {
+            shareable_lock temp(other);
+            swap(temp);
+            return *this;
+        }
+
+        shareable_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
+        {
+            shareable_lock temp(other);
+            swap(temp);
+            return *this;
+        }
+
+        shareable_lock& operator=(boost::move_t<upgradeable_lock<Mutex> > other)
+        {
+            shareable_lock temp(other);
+            swap(temp);
+            return *this;
+        }
+
+        void swap(shareable_lock& other)
+        {
+            std::swap(m,other.m);
+            std::swap(is_locked,other.is_locked);
+        }
+        
+        ~shareable_lock()
+        {
+            if(owns_lock())
+            {
+                m->unlock_shareable();
+            }
+        }
+        void lock()
+        {
+            if(owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            m->lock_shareable();
+            is_locked=true;
+        }
+        bool try_lock()
+        {
+            if(owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            is_locked=m->try_lock_shareable();
+            return is_locked;
+        }
+        void unlock()
+        {
+            if(!owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            m->unlock_shareable();
+            is_locked=false;
+        }
+            
+        typedef void (shareable_lock::*bool_type)();
+        operator bool_type() const
+        {
+            return is_locked?&shareable_lock::lock:0;
+        }
+        bool owns_lock() const
+        {
+            return is_locked;
+        }
+
+    };
+
+    template<typename Mutex>
+    class upgradeable_lock
+    {
+    protected:
+        Mutex* m;
+        bool is_locked;
+    private:
+        explicit upgradeable_lock(upgradeable_lock&);
+        upgradeable_lock& operator=(upgradeable_lock&);
+    public:
+        explicit upgradeable_lock(Mutex& m_):
+            m(&m_),is_locked(false)
+        {
+            lock();
+        }
+        upgradeable_lock(Mutex& m_,bool do_lock):
+            m(&m_),is_locked(false)
+        {
+            if(do_lock)
+            {
+                lock();
+            }
+        }
+        upgradeable_lock(boost::move_t<upgradeable_lock> other):
+            m(other->m),is_locked(other->is_locked)
+        {
+            other->is_locked=false;
+        }
+
+        upgradeable_lock(boost::move_t<unique_lock<Mutex> > other):
+            m(other->m),is_locked(other->is_locked)
+        {
+            other->is_locked=false;
+            if(is_locked)
+            {
+                m->unlock_and_lock_upgradeable();
+            }
+        }
+
+        upgradeable_lock& operator=(boost::move_t<upgradeable_lock> other)
+        {
+            upgradeable_lock temp(other);
+            swap(temp);
+            return *this;
+        }
+
+        upgradeable_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
+        {
+            upgradeable_lock temp(other);
+            swap(temp);
+            return *this;
+        }
+
+        void swap(upgradeable_lock& other)
+        {
+            std::swap(m,other.m);
+            std::swap(is_locked,other.is_locked);
+        }
+        
+        ~upgradeable_lock()
+        {
+            if(owns_lock())
+            {
+                m->unlock_upgradeable();
+            }
+        }
+        void lock()
+        {
+            if(owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            m->lock_upgradeable();
+            is_locked=true;
+        }
+        bool try_lock()
+        {
+            if(owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            is_locked=m->try_lock_upgradeable();
+            return is_locked;
+        }
+        void unlock()
+        {
+            if(!owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            m->unlock_upgradeable();
+            is_locked=false;
+        }
+            
+        typedef void (upgradeable_lock::*bool_type)();
+        operator bool_type() const
+        {
+            return is_locked?&upgradeable_lock::lock:0;
+        }
+        bool owns_lock() const
+        {
+            return is_locked;
+        }
+        friend class shareable_lock<Mutex>;
+        friend class unique_lock<Mutex>;
+    };
+
+    template<typename Mutex>
+    unique_lock<Mutex>::unique_lock(boost::move_t<upgradeable_lock<Mutex> > other):
+        m(other->m),is_locked(other->is_locked)
+    {
+        other->is_locked=false;
+        if(is_locked)
+        {
+            m->unlock_upgradeable_and_lock();
+        }
+    }
+
+    template <class Mutex>
+    class upgrade_to_unique_lock
+    {
+    private:
+        upgradeable_lock<Mutex>* source;
+        unique_lock<Mutex> exclusive;
+
+        explicit upgrade_to_unique_lock(upgrade_to_unique_lock&);
+        upgrade_to_unique_lock& operator=(upgrade_to_unique_lock&);
+    public:
+        explicit upgrade_to_unique_lock(upgradeable_lock<Mutex>& m_):
+            source(&m_),exclusive(boost::move(*source))
+        {}
+        ~upgrade_to_unique_lock()
+        {
+            if(source)
+            {
+                *source=boost::move(exclusive);
+            }
+        }
+
+        upgrade_to_unique_lock(boost::move_t<upgrade_to_unique_lock> other):
+            source(other->source),exclusive(boost::move(other->exclusive))
+        {
+            other->source=0;
+        }
+        
+        upgrade_to_unique_lock& operator=(boost::move_t<upgrade_to_unique_lock> other)
+        {
+            upgrade_to_unique_lock temp(other);
+            swap(temp);
+            return *this;
+        }
+        void swap(upgrade_to_unique_lock& other)
+        {
+            std::swap(source,other.source);
+            exclusive.swap(other.exclusive);
+        }
+        typedef void (upgrade_to_unique_lock::*bool_type)(upgrade_to_unique_lock&);
+        operator bool_type() const
+        {
+            return exclusive.owns_lock()?&upgrade_to_unique_lock::swap:0;
+        }
+        bool owns_lock() const
+        {
+            return exclusive.owns_lock();
+        }
+    };
+}
+
+#endif
diff --git a/include/boost/thread/mutex.hpp b/include/boost/thread/mutex.hpp
index 1b74da55..98a1cbdd 100644
--- a/include/boost/thread/mutex.hpp
+++ b/include/boost/thread/mutex.hpp
@@ -1,170 +1,15 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+#ifndef BOOST_THREAD_MUTEX_HPP
+#define BOOST_THREAD_MUTEX_HPP
+
+//  mutex.hpp
 //
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  (C) Copyright 2007 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_MUTEX_WEK070601_HPP
-#define BOOST_MUTEX_WEK070601_HPP
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(mutex.hpp)
 
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/utility.hpp>
-#include <boost/thread/detail/lock.hpp>
-
-#if defined(BOOST_HAS_PTHREADS)
-#   include <pthread.h>
 #endif
-
-#if defined(BOOST_HAS_MPTASKS)
-#   include "scoped_critical_region.hpp"
-#endif
-
-namespace boost {
-
-struct xtime;
-// disable warnings about non dll import
-// see: http://www.boost.org/more/separate_compilation.html#dlls
-#ifdef BOOST_MSVC
-#   pragma warning(push)
-#   pragma warning(disable: 4251 4231 4660 4275)
-#endif
-
-class BOOST_THREAD_DECL mutex
-    : private noncopyable
-{
-public:
-    friend class detail::thread::lock_ops<mutex>;
-
-    typedef detail::thread::scoped_lock<mutex> scoped_lock;
-
-    mutex();
-    ~mutex();
-
-private:
-#if defined(BOOST_HAS_WINTHREADS)
-    typedef void* cv_state;
-#elif defined(BOOST_HAS_PTHREADS)
-    struct cv_state
-    {
-        pthread_mutex_t* pmutex;
-    };
-#elif defined(BOOST_HAS_MPTASKS)
-    struct cv_state
-    {
-    };
-#endif
-    void do_lock();
-    void do_unlock();
-    void do_lock(cv_state& state);
-    void do_unlock(cv_state& state);
-
-#if defined(BOOST_HAS_WINTHREADS)
-    void* m_mutex;
-    bool m_critical_section;
-#elif defined(BOOST_HAS_PTHREADS)
-    pthread_mutex_t m_mutex;
-#elif defined(BOOST_HAS_MPTASKS)
-    threads::mac::detail::scoped_critical_region m_mutex;
-    threads::mac::detail::scoped_critical_region m_mutex_mutex;
-#endif
-};
-
-class BOOST_THREAD_DECL try_mutex
-    : private noncopyable
-{
-public:
-    friend class detail::thread::lock_ops<try_mutex>;
-
-    typedef detail::thread::scoped_lock<try_mutex> scoped_lock;
-    typedef detail::thread::scoped_try_lock<try_mutex> scoped_try_lock;
-
-    try_mutex();
-    ~try_mutex();
-
-private:
-#if defined(BOOST_HAS_WINTHREADS)
-    typedef void* cv_state;
-#elif defined(BOOST_HAS_PTHREADS)
-    struct cv_state
-    {
-        pthread_mutex_t* pmutex;
-    };
-#elif defined(BOOST_HAS_MPTASKS)
-    struct cv_state
-    {
-    };
-#endif
-    void do_lock();
-    bool do_trylock();
-    void do_unlock();
-    void do_lock(cv_state& state);
-    void do_unlock(cv_state& state);
-
-#if defined(BOOST_HAS_WINTHREADS)
-    void* m_mutex;
-    bool m_critical_section;
-#elif defined(BOOST_HAS_PTHREADS)
-    pthread_mutex_t m_mutex;
-#elif defined(BOOST_HAS_MPTASKS)
-    threads::mac::detail::scoped_critical_region m_mutex;
-    threads::mac::detail::scoped_critical_region m_mutex_mutex;
-#endif
-};
-
-class BOOST_THREAD_DECL timed_mutex
-    : private noncopyable
-{
-public:
-    friend class detail::thread::lock_ops<timed_mutex>;
-
-    typedef detail::thread::scoped_lock<timed_mutex> scoped_lock;
-    typedef detail::thread::scoped_try_lock<timed_mutex> scoped_try_lock;
-    typedef detail::thread::scoped_timed_lock<timed_mutex> scoped_timed_lock;
-
-    timed_mutex();
-    ~timed_mutex();
-
-private:
-#if defined(BOOST_HAS_WINTHREADS)
-    typedef void* cv_state;
-#elif defined(BOOST_HAS_PTHREADS)
-    struct cv_state
-    {
-        pthread_mutex_t* pmutex;
-    };
-#elif defined(BOOST_HAS_MPTASKS)
-    struct cv_state
-    {
-    };
-#endif
-    void do_lock();
-    bool do_trylock();
-    bool do_timedlock(const xtime& xt);
-    void do_unlock();
-    void do_lock(cv_state& state);
-    void do_unlock(cv_state& state);
-
-#if defined(BOOST_HAS_WINTHREADS)
-    void* m_mutex;
-#elif defined(BOOST_HAS_PTHREADS)
-    pthread_mutex_t m_mutex;
-    pthread_cond_t m_condition;
-    bool m_locked;
-#elif defined(BOOST_HAS_MPTASKS)
-    threads::mac::detail::scoped_critical_region m_mutex;
-    threads::mac::detail::scoped_critical_region m_mutex_mutex;
-#endif
-};
-#ifdef BOOST_MSVC
-#   pragma warning(pop)
-#endif
-} // namespace boost
-
-// Change Log:
-//    8 Feb 01  WEKEMPF Initial version.
-//   22 May 01  WEKEMPF Modified to use xtime for time outs.  Factored out
-//                      to three classes, mutex, try_mutex and timed_mutex.
-//    3 Jan 03  WEKEMPF Modified for DLL implementation.
-
-#endif // BOOST_MUTEX_WEK070601_HPP
diff --git a/include/boost/thread/pthread/mutex.hpp b/include/boost/thread/pthread/mutex.hpp
new file mode 100644
index 00000000..09e5313b
--- /dev/null
+++ b/include/boost/thread/pthread/mutex.hpp
@@ -0,0 +1,216 @@
+#ifndef BOOST_THREAD_PTHREAD_MUTEX_HPP
+#define BOOST_THREAD_PTHREAD_MUTEX_HPP
+// (C) Copyright 2007 Anthony Williams
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <pthread.h>
+#include <boost/utility.hpp>
+#include <boost/thread/exceptions.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/thread_time.hpp>
+#include <boost/assert.hpp>
+#include <unistd.h>
+#include <errno.h>
+#include "timespec.hpp"
+
+#ifdef _POSIX_TIMEOUTS
+#if _POSIX_TIMEOUTS >= 0
+#define BOOST_PTHREAD_HAS_TIMEDLOCK
+#endif
+#endif
+
+namespace boost
+{
+    class mutex:
+        boost::noncopyable
+    {
+    private:
+        pthread_mutex_t m;
+    public:
+        mutex()
+        {
+            int const res=pthread_mutex_init(&m,NULL);
+            if(res)
+            {
+                throw thread_resource_error();
+            }
+        }
+        ~mutex()
+        {
+            int const res=pthread_mutex_destroy(&m);
+            BOOST_ASSERT(!res);
+        }
+        
+        void lock()
+        {
+            int const res=pthread_mutex_lock(&m);
+            BOOST_ASSERT(!res);
+        }
+
+        void unlock()
+        {
+            int const res=pthread_mutex_unlock(&m);
+            BOOST_ASSERT(!res);
+        }
+        
+        bool try_lock()
+        {
+            int const res=pthread_mutex_trylock(&m);
+            BOOST_ASSERT(!res || res==EBUSY);
+            return !res;
+        }
+        typedef unique_lock<mutex> scoped_lock;
+        typedef scoped_lock scoped_try_lock;
+    };
+
+    typedef mutex try_mutex;
+
+    class timed_mutex:
+        boost::noncopyable
+    {
+    private:
+        pthread_mutex_t m;
+#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+        pthread_cond_t cond;
+        bool is_locked;
+
+        struct pthread_mutex_scoped_lock
+        {
+            pthread_mutex_t* m;
+            explicit pthread_mutex_scoped_lock(pthread_mutex_t* m_):
+                m(m_)
+            {
+                int const res=pthread_mutex_lock(m);
+                BOOST_ASSERT(!res);
+            }
+            ~pthread_mutex_scoped_lock()
+            {
+                int const res=pthread_mutex_unlock(m);
+                BOOST_ASSERT(!res);
+            }
+            
+        };
+        
+            
+#endif
+    public:
+        timed_mutex()
+        {
+            int const res=pthread_mutex_init(&m,NULL);
+            if(res)
+            {
+                throw thread_resource_error();
+            }
+#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+            int const res2=pthread_cond_init(&cond,NULL);
+            if(res2)
+            {
+                int const destroy_res=pthread_mutex_destroy(&m);
+                BOOST_ASSERT(!destroy_res);
+                throw thread_resource_error();
+            }
+            is_locked=false;
+#endif
+        }
+        ~timed_mutex()
+        {
+            int const res=pthread_mutex_destroy(&m);
+            BOOST_ASSERT(!res);
+#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+            int const res2=pthread_cond_destroy(&cond);
+            BOOST_ASSERT(!res2);
+#endif
+        }
+
+        template<typename TimeDuration>
+        bool timed_lock(TimeDuration const & relative_time)
+        {
+            return timed_lock(get_system_time()+relative_time);
+        }
+
+#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+        void lock()
+        {
+            int const res=pthread_mutex_lock(&m);
+            BOOST_ASSERT(!res);
+        }
+
+        void unlock()
+        {
+            int const res=pthread_mutex_unlock(&m);
+            BOOST_ASSERT(!res);
+        }
+        
+        bool try_lock()
+        {
+            int const res=pthread_mutex_trylock(&m);
+            BOOST_ASSERT(!res || res==EBUSY);
+            return !res;
+        }
+        bool timed_lock(system_time const & abs_time)
+        {
+            struct timespec const timeout=detail::get_timespec(abs_time);
+            int const res=pthread_mutex_timedlock(&m,&timeout);
+            BOOST_ASSERT(!res || res==EBUSY);
+            return !res;
+        }
+#else
+        void lock()
+        {
+            pthread_mutex_scoped_lock const _(&m);
+            while(is_locked)
+            {
+                int const cond_res=pthread_cond_wait(&cond,&m);
+                BOOST_ASSERT(!cond_res);
+            }
+            is_locked=true;
+        }
+
+        void unlock()
+        {
+            pthread_mutex_scoped_lock const _(&m);
+            is_locked=false;
+            int const res=pthread_cond_signal(&cond);
+            BOOST_ASSERT(!res);
+        }
+        
+        bool try_lock()
+        {
+            pthread_mutex_scoped_lock const _(&m);
+            if(is_locked)
+            {
+                return false;
+            }
+            is_locked=true;
+            return true;
+        }
+
+        bool timed_lock(system_time const & abs_time)
+        {
+            struct timespec const timeout=detail::get_timespec(abs_time);
+            pthread_mutex_scoped_lock const _(&m);
+            while(is_locked)
+            {
+                int const cond_res=pthread_cond_timewait(&cond,&m,&timeout);
+                if(cond_res==ETIMEOUT)
+                {
+                    return false;
+                }
+                BOOST_ASSERT(!cond_res);
+            }
+            is_locked=true;
+            return true;
+        }
+#endif
+
+        typedef unique_lock<timed_mutex> scoped_timed_lock;
+        typedef scoped_timed_lock scoped_try_lock;
+        typedef scoped_timed_lock scoped_lock;
+    };
+
+}
+
+
+#endif
diff --git a/include/boost/thread/pthread/recursive_mutex.hpp b/include/boost/thread/pthread/recursive_mutex.hpp
new file mode 100644
index 00000000..2ccc3ae1
--- /dev/null
+++ b/include/boost/thread/pthread/recursive_mutex.hpp
@@ -0,0 +1,276 @@
+#ifndef BOOST_THREAD_PTHREAD_RECURSIVE_MUTEX_HPP
+#define BOOST_THREAD_PTHREAD_RECURSIVE_MUTEX_HPP
+// (C) Copyright 2007 Anthony Williams
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <pthread.h>
+#include <boost/utility.hpp>
+#include <boost/thread/exceptions.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/thread_time.hpp>
+#include <boost/assert.hpp>
+#include <unistd.h>
+#include <boost/date_time/posix_time/conversion.hpp>
+#include <errno.h>
+#include "timespec.hpp"
+
+#ifdef _POSIX_TIMEOUTS
+#if _POSIX_TIMEOUTS >= 0
+#define BOOST_PTHREAD_HAS_TIMEDLOCK
+#endif
+#endif
+
+namespace boost
+{
+    class recursive_mutex:
+        boost::noncopyable
+    {
+    private:
+        pthread_mutex_t m;
+    public:
+        recursive_mutex()
+        {
+            pthread_mutexattr_t attr;
+            
+            int const init_attr_res=pthread_mutexattr_init(&attr);
+            if(init_attr_res)
+            {
+                throw thread_resource_error();
+            }
+            int const set_attr_res=pthread_mutexattr_settype(&attr,PTHREAD_MUTEX_RECURSIVE);
+            if(set_attr_res)
+            {
+                throw thread_resource_error();
+            }
+            
+            int const res=pthread_mutex_init(&m,&attr);
+            if(res)
+            {
+                throw thread_resource_error();
+            }
+            int const destroy_attr_res=pthread_mutexattr_destroy(&attr);
+            BOOST_ASSERT(!destroy_attr_res);
+        }
+        ~recursive_mutex()
+        {
+            int const res=pthread_mutex_destroy(&m);
+            BOOST_ASSERT(!res);
+        }
+        
+        void lock()
+        {
+            int const res=pthread_mutex_lock(&m);
+            BOOST_ASSERT(!res);
+        }
+
+        void unlock()
+        {
+            int const res=pthread_mutex_unlock(&m);
+            BOOST_ASSERT(!res);
+        }
+        
+        bool try_lock()
+        {
+            int const res=pthread_mutex_trylock(&m);
+            BOOST_ASSERT(!res || res==EBUSY);
+            return !res;
+        }
+        typedef unique_lock<recursive_mutex> scoped_lock;
+        typedef scoped_lock scoped_try_lock;
+    };
+
+    typedef recursive_mutex recursive_try_mutex;
+
+    class recursive_timed_mutex:
+        boost::noncopyable
+    {
+    private:
+        pthread_mutex_t m;
+#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
+        pthread_cond_t cond;
+        bool is_locked;
+        pthread_t owner;
+        unsigned count;
+
+        struct pthread_mutex_scoped_lock
+        {
+            pthread_mutex_t* m;
+            explicit pthread_mutex_scoped_lock(pthread_mutex_t* m_):
+                m(m_)
+            {
+                int const res=pthread_mutex_lock(m);
+                BOOST_ASSERT(!res);
+            }
+            ~pthread_mutex_scoped_lock()
+            {
+                int const res=pthread_mutex_unlock(m);
+                BOOST_ASSERT(!res);
+            }
+            
+        };
+        
+            
+#endif
+    public:
+        recursive_timed_mutex()
+        {
+#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+            pthread_mutexattr_t attr;
+            
+            int const init_attr_res=pthread_mutexattr_init(&attr);
+            if(init_attr_res)
+            {
+                throw thread_resource_error();
+            }
+            int const set_attr_res=pthread_mutexattr_settype(&attr,PTHREAD_MUTEX_RECURSIVE);
+            if(set_attr_res)
+            {
+                throw thread_resource_error();
+            }
+            
+            int const res=pthread_mutex_init(&m,&attr);
+            if(res)
+            {
+                throw thread_resource_error();
+            }
+            int const destroy_attr_res=pthread_mutexattr_destroy(&attr);
+            BOOST_ASSERT(!destroy_attr_res);
+#else
+            int const res=pthread_mutex_init(&m,NULL);
+            if(res)
+            {
+                throw thread_resource_error();
+            }
+            int const res2=pthread_cond_init(&cond,NULL);
+            if(res2)
+            {
+                int const destroy_res=pthread_mutex_destroy(&m);
+                BOOST_ASSERT(!destroy_res);
+                throw thread_resource_error();
+            }
+            is_locked=false;
+            count=0;
+#endif
+        }
+        ~recursive_timed_mutex()
+        {
+            int const res=pthread_mutex_destroy(&m);
+            BOOST_ASSERT(!res);
+#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
+            int const res2=pthread_cond_destroy(&cond);
+            BOOST_ASSERT(!res2);
+#endif
+        }
+
+        template<typename TimeDuration>
+        bool timed_lock(TimeDuration const & relative_time)
+        {
+            return timed_lock(get_system_time()+relative_time);
+        }
+
+#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+        void lock()
+        {
+            int const res=pthread_mutex_lock(&m);
+            BOOST_ASSERT(!res);
+        }
+
+        void unlock()
+        {
+            int const res=pthread_mutex_unlock(&m);
+            BOOST_ASSERT(!res);
+        }
+        
+        bool try_lock()
+        {
+            int const res=pthread_mutex_trylock(&m);
+            BOOST_ASSERT(!res || res==EBUSY);
+            return !res;
+        }
+        bool timed_lock(system_time const & abs_time)
+        {
+            struct timespec const timeout=detail::get_timespec(abs_time);
+            int const res=pthread_mutex_timedlock(&m,&timeout);
+            BOOST_ASSERT(!res || res==EBUSY);
+            return !res;
+        }
+#else
+        void lock()
+        {
+            pthread_mutex_scoped_lock const _(&m);
+            if(is_locked && owner==pthread_self())
+            {
+                ++count;
+                return;
+            }
+            
+            while(is_locked)
+            {
+                int const cond_res=pthread_cond_wait(&cond,&m);
+                BOOST_ASSERT(!cond_res);
+            }
+            is_locked=true;
+            ++count;
+            owner=pthread_self();
+        }
+
+        void unlock()
+        {
+            pthread_mutex_scoped_lock const _(&m);
+            if(!--count)
+            {
+                is_locked=false;
+            }
+            int const res=pthread_cond_signal(&cond);
+            BOOST_ASSERT(!res);
+        }
+        
+        bool try_lock()
+        {
+            pthread_mutex_scoped_lock const _(&m);
+            if(is_locked && owner!=pthread_self())
+            {
+                return false;
+            }
+            is_locked=true;
+            ++count;
+            owner=pthread_self();
+            return true;
+        }
+
+        bool timed_lock(system_time const & abs_time)
+        {
+            struct timespec const timeout=detail::get_timespec(abs_time);
+            pthread_mutex_scoped_lock const _(&m);
+            if(is_locked && owner==pthread_self())
+            {
+                ++count;
+                return;
+            }
+            while(is_locked)
+            {
+                int const cond_res=pthread_cond_timewait(&cond,&m,&timeout);
+                if(cond_res==ETIMEOUT)
+                {
+                    return false;
+                }
+                BOOST_ASSERT(!cond_res);
+            }
+            is_locked=true;
+            ++count;
+            owner=pthread_self();
+            return true;
+        }
+#endif
+
+        typedef unique_lock<recursive_timed_mutex> scoped_timed_lock;
+        typedef scoped_timed_lock scoped_try_lock;
+        typedef scoped_timed_lock scoped_lock;
+    };
+
+}
+
+
+#endif
diff --git a/include/boost/thread/pthread/timespec.hpp b/include/boost/thread/pthread/timespec.hpp
new file mode 100644
index 00000000..a7039f7a
--- /dev/null
+++ b/include/boost/thread/pthread/timespec.hpp
@@ -0,0 +1,23 @@
+#ifndef BOOST_THREAD_PTHREAD_TIMESPEC_HPP
+#define BOOST_THREAD_PTHREAD_TIMESPEC_HPP
+
+#include <boost/thread/thread_time.hpp>
+#include <boost/date_time/posix_time/conversion.hpp>
+
+namespace boost
+{
+    namespace detail
+    {
+        inline struct timespec get_timespec(boost::system_time const& abs_time)
+        {
+            struct timespec timeout={0};
+            boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0);
+            
+            timeout.tv_sec=time_since_epoch.total_seconds();
+            timeout.tv_nsec=time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second());
+            return timeout;
+        }
+    }
+}
+
+#endif
diff --git a/include/boost/thread/recursive_mutex.hpp b/include/boost/thread/recursive_mutex.hpp
index a7efa48f..f01ae11b 100644
--- a/include/boost/thread/recursive_mutex.hpp
+++ b/include/boost/thread/recursive_mutex.hpp
@@ -1,184 +1,15 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+#ifndef BOOST_THREAD_RECURSIVE_MUTEX_HPP
+#define BOOST_THREAD_RECURSIVE_MUTEX_HPP
+
+//  recursive_mutex.hpp
 //
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  (C) Copyright 2007 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_RECURSIVE_MUTEX_WEK070601_HPP
-#define BOOST_RECURSIVE_MUTEX_WEK070601_HPP
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(recursive_mutex.hpp)
 
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/utility.hpp>
-#include <boost/thread/detail/lock.hpp>
-
-#if defined(BOOST_HAS_PTHREADS)
-#   include <pthread.h>
 #endif
-
-#if defined(BOOST_HAS_MPTASKS)
-#   include "scoped_critical_region.hpp"
-#endif
-
-namespace boost {
-
-struct xtime;
-// disable warnings about non dll import
-// see: http://www.boost.org/more/separate_compilation.html#dlls
-#ifdef BOOST_MSVC
-#   pragma warning(push)
-#   pragma warning(disable: 4251 4231 4660 4275)
-#endif
-class BOOST_THREAD_DECL recursive_mutex
-    : private noncopyable
-{
-public:
-    friend class detail::thread::lock_ops<recursive_mutex>;
-
-    typedef detail::thread::scoped_lock<recursive_mutex> scoped_lock;
-
-    recursive_mutex();
-    ~recursive_mutex();
-
-private:
-#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
-    typedef std::size_t cv_state;
-#elif defined(BOOST_HAS_PTHREADS)
-    struct cv_state
-    {
-        long count;
-        pthread_mutex_t* pmutex;
-    };
-#endif
-    void do_lock();
-    void do_unlock();
-    void do_lock(cv_state& state);
-    void do_unlock(cv_state& state);
-
-#if defined(BOOST_HAS_WINTHREADS)
-    void* m_mutex;
-    bool m_critical_section;
-    unsigned long m_count;
-#elif defined(BOOST_HAS_PTHREADS)
-    pthread_mutex_t m_mutex;
-    unsigned m_count;
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    pthread_cond_t m_unlocked;
-    pthread_t m_thread_id;
-    bool m_valid_id;
-#   endif
-#elif defined(BOOST_HAS_MPTASKS)
-    threads::mac::detail::scoped_critical_region m_mutex;
-    threads::mac::detail::scoped_critical_region m_mutex_mutex;
-    std::size_t m_count;
-#endif
-};
-
-class BOOST_THREAD_DECL recursive_try_mutex
-    : private noncopyable
-{
-public:
-    friend class detail::thread::lock_ops<recursive_try_mutex>;
-
-    typedef detail::thread::scoped_lock<recursive_try_mutex> scoped_lock;
-    typedef detail::thread::scoped_try_lock<
-        recursive_try_mutex> scoped_try_lock;
-
-    recursive_try_mutex();
-    ~recursive_try_mutex();
-
-private:
-#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
-    typedef std::size_t cv_state;
-#elif defined(BOOST_HAS_PTHREADS)
-    struct cv_state
-    {
-        long count;
-        pthread_mutex_t* pmutex;
-    };
-#endif
-    void do_lock();
-    bool do_trylock();
-    void do_unlock();
-    void do_lock(cv_state& state);
-    void do_unlock(cv_state& state);
-
-#if defined(BOOST_HAS_WINTHREADS)
-    void* m_mutex;
-    bool m_critical_section;
-    unsigned long m_count;
-#elif defined(BOOST_HAS_PTHREADS)
-    pthread_mutex_t m_mutex;
-    unsigned m_count;
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    pthread_cond_t m_unlocked;
-    pthread_t m_thread_id;
-    bool m_valid_id;
-#   endif
-#elif defined(BOOST_HAS_MPTASKS)
-    threads::mac::detail::scoped_critical_region m_mutex;
-    threads::mac::detail::scoped_critical_region m_mutex_mutex;
-    std::size_t m_count;
-#endif
-};
-
-class BOOST_THREAD_DECL recursive_timed_mutex
-    : private noncopyable
-{
-public:
-    friend class detail::thread::lock_ops<recursive_timed_mutex>;
-
-    typedef detail::thread::scoped_lock<recursive_timed_mutex> scoped_lock;
-    typedef detail::thread::scoped_try_lock<
-        recursive_timed_mutex> scoped_try_lock;
-    typedef detail::thread::scoped_timed_lock<
-        recursive_timed_mutex> scoped_timed_lock;
-
-    recursive_timed_mutex();
-    ~recursive_timed_mutex();
-
-private:
-#if (defined(BOOST_HAS_WINTHREADS) || defined(BOOST_HAS_MPTASKS))
-    typedef std::size_t cv_state;
-#elif defined(BOOST_HAS_PTHREADS)
-    struct cv_state
-    {
-        long count;
-        pthread_mutex_t* pmutex;
-    };
-#endif
-    void do_lock();
-    bool do_trylock();
-    bool do_timedlock(const xtime& xt);
-    void do_unlock();
-    void do_lock(cv_state& state);
-    void do_unlock(cv_state& state);
-
-#if defined(BOOST_HAS_WINTHREADS)
-    void* m_mutex;
-    unsigned long m_count;
-#elif defined(BOOST_HAS_PTHREADS)
-    pthread_mutex_t m_mutex;
-    pthread_cond_t m_unlocked;
-    pthread_t m_thread_id;
-    bool m_valid_id;
-    unsigned m_count;
-#elif defined(BOOST_HAS_MPTASKS)
-    threads::mac::detail::scoped_critical_region m_mutex;
-    threads::mac::detail::scoped_critical_region m_mutex_mutex;
-    std::size_t m_count;
-#endif
-};
-#ifdef BOOST_MSVC
-#   pragma warning(pop)
-#endif
-} // namespace boost
-
-#endif // BOOST_RECURSIVE_MUTEX_WEK070601_HPP
-
-// Change Log:
-//    8 Feb 01  WEKEMPF Initial version.
-//    1 Jun 01  WEKEMPF Modified to use xtime for time outs.  Factored out
-//                      to three classes, mutex, try_mutex and timed_mutex.
-//   11 Jun 01  WEKEMPF Modified to use PTHREAD_MUTEX_RECURSIVE if available.
-//    3 Jan 03  WEKEMPF Modified for DLL implementation.
diff --git a/include/boost/thread/thread_time.hpp b/include/boost/thread/thread_time.hpp
new file mode 100644
index 00000000..8c735977
--- /dev/null
+++ b/include/boost/thread/thread_time.hpp
@@ -0,0 +1,40 @@
+#ifndef BOOST_THREAD_TIME_HPP
+#define BOOST_THREAD_TIME_HPP
+#include <boost/date_time/microsec_time_clock.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+
+namespace boost
+{
+    typedef boost::posix_time::ptime system_time;
+    
+    inline system_time get_system_time()
+    {
+        return boost::date_time::microsec_clock<system_time>::universal_time();
+    }
+
+    namespace detail
+    {
+        inline system_time get_system_time_sentinel()
+        {
+            return system_time(boost::posix_time::pos_infin);
+        }
+
+        inline unsigned get_milliseconds_until(system_time const& target_time)
+        {
+            if(target_time.is_pos_infinity())
+            {
+                return ~0u;
+            }
+            system_time const now=get_system_time();
+            if(target_time<=now)
+            {
+                return 0;
+            }
+            return (target_time-now).total_milliseconds();
+        }
+
+    }
+    
+}
+
+#endif
diff --git a/include/boost/thread/win32/basic_recursive_mutex.hpp b/include/boost/thread/win32/basic_recursive_mutex.hpp
new file mode 100644
index 00000000..e5f79981
--- /dev/null
+++ b/include/boost/thread/win32/basic_recursive_mutex.hpp
@@ -0,0 +1,120 @@
+#ifndef BOOST_BASIC_RECURSIVE_MUTEX_WIN32_HPP
+#define BOOST_BASIC_RECURSIVE_MUTEX_WIN32_HPP
+
+//  basic_recursive_mutex.hpp
+//
+//  (C) Copyright 2006-7 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include "thread_primitives.hpp"
+#include "basic_timed_mutex.hpp"
+
+namespace boost
+{
+    namespace detail
+    {
+        template<typename underlying_mutex_type>
+        struct basic_recursive_mutex_impl
+        {
+            long recursion_count;
+            long locking_thread_id;
+            underlying_mutex_type mutex;
+
+            void initialize()
+            {
+                recursion_count=0;
+                locking_thread_id=0;
+                mutex.initialize();
+            }
+
+            void destroy()
+            {
+                mutex.destroy();
+            }
+
+            bool try_lock()
+            {
+                long const current_thread_id=win32::GetCurrentThreadId();
+                return try_recursive_lock(current_thread_id) || try_basic_lock(current_thread_id);
+            }
+            
+            void lock()
+            {
+                long const current_thread_id=win32::GetCurrentThreadId();
+                if(!try_recursive_lock(current_thread_id))
+                {
+                    mutex.lock();
+                    BOOST_INTERLOCKED_EXCHANGE(&locking_thread_id,current_thread_id);
+                    recursion_count=1;
+                }
+            }
+            bool timed_lock(::boost::system_time const& target)
+            {
+                long const current_thread_id=win32::GetCurrentThreadId();
+                return try_recursive_lock(current_thread_id) || try_timed_lock(current_thread_id,target);
+            }
+            long get_active_count()
+            {
+                return mutex.get_active_count();
+            }
+
+            void unlock()
+            {
+                if(!--recursion_count)
+                {
+                    BOOST_INTERLOCKED_EXCHANGE(&locking_thread_id,0);
+                    mutex.unlock();
+                }
+            }
+
+            bool locked()
+            {
+                return mutex.locked();
+            }
+            
+        private:
+            bool try_recursive_lock(long current_thread_id)
+            {
+                if(::boost::detail::interlocked_read_acquire(&locking_thread_id)==current_thread_id)
+                {
+                    ++recursion_count;
+                    return true;
+                }
+                return false;
+            }
+            
+            bool try_basic_lock(long current_thread_id)
+            {
+                if(mutex.try_lock())
+                {
+                    BOOST_INTERLOCKED_EXCHANGE(&locking_thread_id,current_thread_id);
+                    recursion_count=1;
+                    return true;
+                }
+                return false;
+            }
+            
+            bool try_timed_lock(long current_thread_id,::boost::system_time const& target)
+            {
+                if(mutex.timed_lock(target))
+                {
+                    BOOST_INTERLOCKED_EXCHANGE(&locking_thread_id,current_thread_id);
+                    recursion_count=1;
+                    return true;
+                }
+                return false;
+            }
+            
+        };
+
+        typedef basic_recursive_mutex_impl<basic_timed_mutex> basic_recursive_mutex;
+        typedef basic_recursive_mutex_impl<basic_timed_mutex> basic_recursive_timed_mutex;
+    }
+}
+
+#define BOOST_BASIC_RECURSIVE_MUTEX_INITIALIZER {0}
+
+#endif
diff --git a/include/boost/thread/win32/basic_timed_mutex.hpp b/include/boost/thread/win32/basic_timed_mutex.hpp
new file mode 100644
index 00000000..bc2b1af0
--- /dev/null
+++ b/include/boost/thread/win32/basic_timed_mutex.hpp
@@ -0,0 +1,157 @@
+#ifndef BOOST_BASIC_TIMED_MUTEX_WIN32_HPP
+#define BOOST_BASIC_TIMED_MUTEX_WIN32_HPP
+
+//  basic_timed_mutex_win32.hpp
+//
+//  (C) Copyright 2006 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/assert.hpp>
+#include "thread_primitives.hpp"
+#include "interlocked_read.hpp"
+#include <boost/thread/thread_time.hpp>
+
+namespace boost
+{
+    namespace detail
+    {
+        struct basic_timed_mutex
+        {
+            BOOST_STATIC_CONSTANT(long,lock_flag_value=0x80000000);
+            long active_count;
+            void* event;
+
+            void initialize()
+            {
+                active_count=0;
+                event=0;
+            }
+
+            void destroy()
+            {
+                void* const old_event=BOOST_INTERLOCKED_EXCHANGE_POINTER(&event,0);
+                if(old_event)
+                {
+                    win32::CloseHandle(old_event);
+                }
+            }
+            
+          
+            bool try_lock()
+            {
+                long old_count=active_count&~lock_flag_value;
+                do
+                {
+                    long const current_count=BOOST_INTERLOCKED_COMPARE_EXCHANGE(&active_count,(old_count+1)|lock_flag_value,old_count);
+                    if(current_count==old_count)
+                    {
+                        return true;
+                    }
+                    old_count=current_count;
+                }
+                while(!(old_count&lock_flag_value));
+                return false;
+            }
+            
+            void lock()
+            {
+                bool const success=timed_lock(::boost::detail::get_system_time_sentinel());
+                BOOST_ASSERT(success);
+            }
+            bool timed_lock(::boost::system_time const& wait_until)
+            {
+                long old_count=active_count;
+                while(true)
+                {
+                    long const current_count=BOOST_INTERLOCKED_COMPARE_EXCHANGE(&active_count,(old_count+1)|lock_flag_value,old_count);
+                    if(current_count==old_count)
+                    {
+                        break;
+                    }
+                    old_count=current_count;
+                }
+
+                if(old_count&lock_flag_value)
+                {
+                    bool lock_acquired=false;
+                    void* const sem=get_event();
+                    ++old_count; // we're waiting, too
+                    do
+                    {
+                        old_count-=(lock_flag_value+1); // there will be one less active thread on this mutex when it gets unlocked
+                        if(win32::WaitForSingleObject(sem,::boost::detail::get_milliseconds_until(wait_until))!=0)
+                        {
+                            BOOST_INTERLOCKED_DECREMENT(&active_count);
+                            return false;
+                        }
+                        do
+                        {
+                            long const current_count=BOOST_INTERLOCKED_COMPARE_EXCHANGE(&active_count,old_count|lock_flag_value,old_count);
+                            if(current_count==old_count)
+                            {
+                                break;
+                            }
+                            old_count=current_count;
+                        }
+                        while(!(old_count&lock_flag_value));
+                        lock_acquired=!(old_count&lock_flag_value);
+                    }
+                    while(!lock_acquired);
+                }
+                return true;
+            }
+
+            long get_active_count()
+            {
+                return ::boost::detail::interlocked_read_acquire(&active_count);
+            }
+
+            void unlock()
+            {
+                long const offset=lock_flag_value+1;
+                long old_count=BOOST_INTERLOCKED_EXCHANGE_ADD(&active_count,-offset);
+                
+                if(old_count>offset)
+                {
+                    win32::SetEvent(get_event());
+                }
+            }
+
+            bool locked()
+            {
+                return get_active_count()>=lock_flag_value;
+            }
+            
+        private:
+            void* get_event()
+            {
+                void* current_event=::boost::detail::interlocked_read_acquire(&event);
+                
+                if(!current_event)
+                {
+                    void* const new_event=win32::create_anonymous_event(win32::auto_reset_event,win32::event_initially_reset);
+                    void* const old_event=BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(&event,new_event,0);
+                    if(old_event!=0)
+                    {
+                        win32::CloseHandle(new_event);
+                        return old_event;
+                    }
+                    else
+                    {
+                        return new_event;
+                    }
+                }
+                return current_event;
+            }
+            
+        };
+        
+    }
+}
+
+#define BOOST_BASIC_TIMED_MUTEX_INITIALIZER {0}
+
+#endif
diff --git a/include/boost/thread/win32/mutex.hpp b/include/boost/thread/win32/mutex.hpp
new file mode 100644
index 00000000..29759a9a
--- /dev/null
+++ b/include/boost/thread/win32/mutex.hpp
@@ -0,0 +1,61 @@
+#ifndef BOOST_THREAD_WIN32_MUTEX_HPP
+#define BOOST_THREAD_WIN32_MUTEX_HPP
+// (C) Copyright 2005-7 Anthony Williams
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include "basic_timed_mutex.hpp"
+#include <boost/utility.hpp>
+#include <boost/thread/exceptions.hpp>
+#include <boost/thread/locks.hpp>
+
+namespace boost
+{
+    namespace detail
+    {
+        typedef ::boost::detail::basic_timed_mutex underlying_mutex;
+    }
+
+    class mutex:
+		boost::noncopyable,
+        public ::boost::detail::underlying_mutex
+    {
+    public:
+        mutex()
+        {
+            initialize();
+        }
+        ~mutex()
+        {
+            destroy();
+        }
+
+        typedef unique_lock<mutex> scoped_lock;
+        typedef scoped_lock scoped_try_lock;
+    };
+
+    typedef mutex try_mutex;
+
+    class timed_mutex:
+        boost::noncopyable,
+        public ::boost::detail::basic_timed_mutex
+    {
+    public:
+        timed_mutex()
+        {
+            initialize();
+        }
+
+        ~timed_mutex()
+        {
+            destroy();
+        }
+
+        typedef unique_lock<timed_mutex> scoped_timed_lock;
+        typedef scoped_timed_lock scoped_try_lock;
+        typedef scoped_timed_lock scoped_lock;
+    };
+}
+
+#endif
diff --git a/include/boost/thread/win32/recursive_mutex.hpp b/include/boost/thread/win32/recursive_mutex.hpp
new file mode 100644
index 00000000..855dd15b
--- /dev/null
+++ b/include/boost/thread/win32/recursive_mutex.hpp
@@ -0,0 +1,61 @@
+#ifndef BOOST_RECURSIVE_MUTEX_WIN32_HPP
+#define BOOST_RECURSIVE_MUTEX_WIN32_HPP
+
+//  recursive_mutex.hpp
+//
+//  (C) Copyright 2006-7 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+
+#include <boost/utility.hpp>
+#include "basic_recursive_mutex.hpp"
+#include <boost/thread/exceptions.hpp>
+#include <boost/thread/locks.hpp>
+
+namespace boost
+{
+    class recursive_mutex:
+        boost::noncopyable,
+        public ::boost::detail::basic_recursive_mutex
+    {
+    public:
+        recursive_mutex()
+        {
+            ::boost::detail::basic_recursive_mutex::initialize();
+        }
+        ~recursive_mutex()
+        {
+            ::boost::detail::basic_recursive_mutex::destroy();
+        }
+
+        typedef unique_lock<recursive_mutex> scoped_lock;
+        typedef scoped_lock scoped_try_lock;
+    };
+
+    typedef recursive_mutex recursive_try_mutex;
+
+    class recursive_timed_mutex:
+        boost::noncopyable,
+        public ::boost::detail::basic_recursive_timed_mutex
+    {
+    public:
+        recursive_timed_mutex()
+        {
+            ::boost::detail::basic_recursive_timed_mutex::initialize();
+        }
+        ~recursive_timed_mutex()
+        {
+            ::boost::detail::basic_recursive_timed_mutex::destroy();
+        }
+
+        typedef unique_lock<recursive_timed_mutex> scoped_timed_lock;
+        typedef scoped_timed_lock scoped_try_lock;
+        typedef scoped_timed_lock scoped_lock;
+    };
+}
+
+
+#endif
diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
index 2213c7b8..6ada6ae4 100644
--- a/include/boost/thread/win32/thread_primitives.hpp
+++ b/include/boost/thread/win32/thread_primitives.hpp
@@ -113,13 +113,21 @@ namespace boost
             inline handle create_anonymous_event(event_type type,initial_event_state state)
             {
                 handle const res=CreateEventA(0,type,state,0);
-                return res?res:throw thread_resource_error();
+                if(!res)
+                {
+                    throw thread_resource_error();
+                }
+                return res;
             }
 
             inline handle create_anonymous_semaphore(long initial_count,long max_count)
             {
                 handle const res=CreateSemaphoreA(NULL,initial_count,max_count,NULL);
-                return res?res:throw thread_resource_error();
+                if(!res)
+                {
+                    throw thread_resource_error();
+                }
+                return res;
             }
 
             inline handle duplicate_handle(handle source)
@@ -128,7 +136,11 @@ namespace boost
                 long const same_access_flag=2;
                 handle new_handle=0;
                 bool const success=DuplicateHandle(current_process,source,current_process,&new_handle,0,false,same_access_flag)!=0;
-                return success?new_handle:throw thread_resource_error();
+                if(!success)
+                {
+                    throw thread_resource_error();
+                }
+                return new_handle;
             }
 
             inline void release_semaphore(handle semaphore,long count)
diff --git a/src/condition.cpp b/src/condition.cpp
index ffccad05..18ca0ef8 100644
--- a/src/condition.cpp
+++ b/src/condition.cpp
@@ -342,6 +342,9 @@ condition_impl::condition_impl()
     res = pthread_cond_init(&m_condition, 0);
     if (res != 0)
         throw thread_resource_error();
+    res = pthread_mutex_init(&m_mutex, 0);
+    if (res != 0)
+        throw thread_resource_error();
 }
 
 condition_impl::~condition_impl()
@@ -349,20 +352,30 @@ condition_impl::~condition_impl()
     int res = 0;
     res = pthread_cond_destroy(&m_condition);
     assert(res == 0);
+    res = pthread_mutex_destroy(&m_mutex);
+    assert(res == 0);
 }
 
 void condition_impl::notify_one()
 {
     int res = 0;
+    res = pthread_mutex_lock(&m_mutex);
+    assert(res == 0);
     res = pthread_cond_signal(&m_condition);
     assert(res == 0);
+    res = pthread_mutex_unlock(&m_mutex);
+    assert(res == 0);
 }
 
 void condition_impl::notify_all()
 {
     int res = 0;
+    res = pthread_mutex_lock(&m_mutex);
+    assert(res == 0);
     res = pthread_cond_broadcast(&m_condition);
     assert(res == 0);
+    res = pthread_mutex_unlock(&m_mutex);
+    assert(res == 0);
 }
 
 void condition_impl::do_wait(pthread_mutex_t* pmutex)
diff --git a/src/thread.cpp b/src/thread.cpp
index e96e5829..dc8ff078 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -10,6 +10,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/xtime.hpp>
 #include <boost/thread/condition.hpp>
+#include <boost/thread/locks.hpp>
 #include <cassert>
 
 #if defined(BOOST_HAS_WINTHREADS)
diff --git a/test/test_mutex.cpp b/test/test_mutex.cpp
index 831e6bba..08170fd2 100644
--- a/test/test_mutex.cpp
+++ b/test/test_mutex.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/thread/xtime.hpp>
+#include <boost/thread/thread_time.hpp>
 #include <boost/thread/condition.hpp>
 
 #include <boost/test/unit_test.hpp>
@@ -29,7 +29,7 @@ struct test_lock
 
         // Test the lock's constructors.
         {
-            lock_type lock(mutex, false);
+            lock_type lock(mutex, boost::defer_lock);
             BOOST_CHECK(!lock);
         }
         lock_type lock(mutex);
@@ -69,10 +69,10 @@ struct test_trylock
             BOOST_CHECK(lock ? true : false);
         }
         {
-            try_lock_type lock(mutex, false);
+            try_lock_type lock(mutex, boost::defer_lock);
             BOOST_CHECK(!lock);
         }
-        try_lock_type lock(mutex, true);
+        try_lock_type lock(mutex);
         BOOST_CHECK(lock ? true : false);
 
         // Construct and initialize an xtime for a fast time out.
@@ -110,16 +110,16 @@ struct test_timedlock
         // Test the lock's constructors.
         {
             // Construct and initialize an xtime for a fast time out.
-            boost::xtime xt = delay(0, 100);
+            boost::system_time xt = boost::get_system_time()+boost::posix_time::milliseconds(100);
 
             timed_lock_type lock(mutex, xt);
             BOOST_CHECK(lock ? true : false);
         }
         {
-            timed_lock_type lock(mutex, false);
+            timed_lock_type lock(mutex, boost::defer_lock);
             BOOST_CHECK(!lock);
         }
-        timed_lock_type lock(mutex, true);
+        timed_lock_type lock(mutex);
         BOOST_CHECK(lock ? true : false);
 
         // Construct and initialize an xtime for a fast time out.
@@ -139,8 +139,8 @@ struct test_timedlock
         BOOST_CHECK(lock ? true : false);
         lock.unlock();
         BOOST_CHECK(!lock);
-        xt = delay(0, 100);
-        BOOST_CHECK(lock.timed_lock(xt));
+        boost::system_time target = boost::get_system_time()+boost::posix_time::milliseconds(100);
+        BOOST_CHECK(lock.timed_lock(target));
         BOOST_CHECK(lock ? true : false);
     }
 };

From 041530a953a7f5125838f035799cd4e08ed208d9 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Mon, 8 Oct 2007 15:44:13 +0000
Subject: [PATCH 10/16] added backwards-compatibility overload for call_once

[SVN r39785]
---
 include/boost/thread/once.hpp | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/include/boost/thread/once.hpp b/include/boost/thread/once.hpp
index 7ff1464a..d29efe8f 100644
--- a/include/boost/thread/once.hpp
+++ b/include/boost/thread/once.hpp
@@ -10,19 +10,14 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#ifdef BOOST_HAS_MPTASKS
-namespace boost {
-
-typedef long once_flag;
-#define BOOST_ONCE_INIT 0
-
-void call_once(once_flag& flag, void (*func)());
+#include BOOST_THREAD_PLATFORM(once.hpp)
 
+namespace boost
+{
+    inline void call_once(void (*func)(),once_flag& flag)
+    {
+        call_once(flag,func);
+    }
 }
 
-#else
-#include BOOST_THREAD_PLATFORM(once.hpp)
-#endif
-
-
 #endif

From a87914ef2375f568e49d6f2c8dae8bcb72d6a589 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Tue, 9 Oct 2007 06:59:14 +0000
Subject: [PATCH 11/16] added missing move.hpp header

[SVN r39832]
---
 include/boost/thread/detail/move.hpp | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 include/boost/thread/detail/move.hpp

diff --git a/include/boost/thread/detail/move.hpp b/include/boost/thread/detail/move.hpp
new file mode 100644
index 00000000..ba4bb655
--- /dev/null
+++ b/include/boost/thread/detail/move.hpp
@@ -0,0 +1,33 @@
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// (C) Copyright 2007 Anthony Williams
+
+#ifndef BOOST_THREAD_MOVE_HPP
+#define BOOST_THREAD_MOVE_HPP
+
+namespace boost
+{
+    template<typename T>
+    struct move_t
+    {
+        T& t;
+        move_t(T& t_):
+            t(t_)
+        {}
+
+        T* operator->() const
+        {
+            return &t;
+        }
+    };
+
+    template<typename T>
+    move_t<T> move(T& t)
+    {
+        return move_t<T>(t);
+    }
+}
+
+
+#endif

From 432bd29c1c39f9bb996bfad9783ec61dc2469ef6 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Tue, 9 Oct 2007 12:23:09 +0000
Subject: [PATCH 12/16] fixed direction of conditional

[SVN r39836]
---
 include/boost/thread/pthread/mutex.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/thread/pthread/mutex.hpp b/include/boost/thread/pthread/mutex.hpp
index 09e5313b..83dec8bf 100644
--- a/include/boost/thread/pthread/mutex.hpp
+++ b/include/boost/thread/pthread/mutex.hpp
@@ -72,7 +72,7 @@ namespace boost
     {
     private:
         pthread_mutex_t m;
-#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
         pthread_cond_t cond;
         bool is_locked;
 

From 16c7cf9b5e6439c4a30d9f80a2ceb61bba593edc Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Tue, 9 Oct 2007 12:45:46 +0000
Subject: [PATCH 13/16] fixed typo in pthread_cond_timedwait and ETIMEDOUT

[SVN r39838]
---
 include/boost/thread/pthread/mutex.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/thread/pthread/mutex.hpp b/include/boost/thread/pthread/mutex.hpp
index 83dec8bf..97cb3b91 100644
--- a/include/boost/thread/pthread/mutex.hpp
+++ b/include/boost/thread/pthread/mutex.hpp
@@ -193,8 +193,8 @@ namespace boost
             pthread_mutex_scoped_lock const _(&m);
             while(is_locked)
             {
-                int const cond_res=pthread_cond_timewait(&cond,&m,&timeout);
-                if(cond_res==ETIMEOUT)
+                int const cond_res=pthread_cond_timedwait(&cond,&m,&timeout);
+                if(cond_res==ETIMEDOUT)
                 {
                     return false;
                 }

From 55afcf678d5cd4a9e2c6b7d003b4888907cdb1b2 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Tue, 9 Oct 2007 14:08:22 +0000
Subject: [PATCH 14/16] fixed typo in pthread_cond_timedwait and ETIMEDOUT

[SVN r39839]
---
 include/boost/thread/pthread/recursive_mutex.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/thread/pthread/recursive_mutex.hpp b/include/boost/thread/pthread/recursive_mutex.hpp
index 2ccc3ae1..4a52ea69 100644
--- a/include/boost/thread/pthread/recursive_mutex.hpp
+++ b/include/boost/thread/pthread/recursive_mutex.hpp
@@ -251,8 +251,8 @@ namespace boost
             }
             while(is_locked)
             {
-                int const cond_res=pthread_cond_timewait(&cond,&m,&timeout);
-                if(cond_res==ETIMEOUT)
+                int const cond_res=pthread_cond_timedwait(&cond,&m,&timeout);
+                if(cond_res==ETIMEDOUT)
                 {
                     return false;
                 }

From 5a4d5ddb9d9bc2819f282e3f1272725f8906b1c4 Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Tue, 9 Oct 2007 14:44:37 +0000
Subject: [PATCH 15/16] fixed more has-timed-lock backwards conditions

[SVN r39841]
---
 include/boost/thread/pthread/mutex.hpp           | 4 ++--
 include/boost/thread/pthread/recursive_mutex.hpp | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/boost/thread/pthread/mutex.hpp b/include/boost/thread/pthread/mutex.hpp
index 97cb3b91..b8b9c670 100644
--- a/include/boost/thread/pthread/mutex.hpp
+++ b/include/boost/thread/pthread/mutex.hpp
@@ -103,7 +103,7 @@ namespace boost
             {
                 throw thread_resource_error();
             }
-#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
             int const res2=pthread_cond_init(&cond,NULL);
             if(res2)
             {
@@ -118,7 +118,7 @@ namespace boost
         {
             int const res=pthread_mutex_destroy(&m);
             BOOST_ASSERT(!res);
-#ifdef BOOST_PTHREAD_HAS_TIMEDLOCK
+#ifndef BOOST_PTHREAD_HAS_TIMEDLOCK
             int const res2=pthread_cond_destroy(&cond);
             BOOST_ASSERT(!res2);
 #endif
diff --git a/include/boost/thread/pthread/recursive_mutex.hpp b/include/boost/thread/pthread/recursive_mutex.hpp
index 4a52ea69..92002600 100644
--- a/include/boost/thread/pthread/recursive_mutex.hpp
+++ b/include/boost/thread/pthread/recursive_mutex.hpp
@@ -133,6 +133,8 @@ namespace boost
             int const res=pthread_mutex_init(&m,&attr);
             if(res)
             {
+                int const destroy_attr_res=pthread_mutexattr_destroy(&attr);
+                BOOST_ASSERT(!destroy_attr_res);
                 throw thread_resource_error();
             }
             int const destroy_attr_res=pthread_mutexattr_destroy(&attr);
@@ -247,7 +249,7 @@ namespace boost
             if(is_locked && owner==pthread_self())
             {
                 ++count;
-                return;
+                return true;
             }
             while(is_locked)
             {

From 291873248103655039d9dd958da2baa7b1e24b1d Mon Sep 17 00:00:00 2001
From: Anthony Williams <anthony.ajw@gmail.com>
Date: Wed, 10 Oct 2007 15:33:49 +0000
Subject: [PATCH 16/16] read_write_mutex makes a comeback --- as shared_mutex

[SVN r39891]
---
 include/boost/thread/locks.hpp                |  162 ++-
 include/boost/thread/pthread/shared_mutex.hpp |  300 +++++
 include/boost/thread/shared_mutex.hpp         |   15 +
 include/boost/thread/thread_time.hpp          |    2 +-
 include/boost/thread/win32/shared_mutex.hpp   |  516 ++++++++
 .../boost/thread/win32/thread_primitives.hpp  |    3 +-
 include/boost/thread/xtime.hpp                |   12 +
 src/mutex.cpp                                 |  561 ---------
 src/mutex.inl                                 |  132 ---
 src/once.cpp                                  |   50 -
 src/recursive_mutex.cpp                       | 1040 -----------------
 test/Jamfile.v2                               |    3 +-
 test/test_lock_concept.cpp                    |  173 +++
 test/test_shared_mutex.cpp                    |  460 ++++++++
 14 files changed, 1579 insertions(+), 1850 deletions(-)
 create mode 100644 include/boost/thread/pthread/shared_mutex.hpp
 create mode 100644 include/boost/thread/shared_mutex.hpp
 create mode 100644 include/boost/thread/win32/shared_mutex.hpp
 delete mode 100644 src/mutex.cpp
 delete mode 100644 src/mutex.inl
 delete mode 100644 src/once.cpp
 delete mode 100644 src/recursive_mutex.cpp
 create mode 100644 test/test_lock_concept.cpp
 create mode 100644 test/test_shared_mutex.cpp

diff --git a/include/boost/thread/locks.hpp b/include/boost/thread/locks.hpp
index 258b0f60..b56c996e 100644
--- a/include/boost/thread/locks.hpp
+++ b/include/boost/thread/locks.hpp
@@ -24,13 +24,13 @@ namespace boost
     const adopt_lock_t adopt_lock={};
 
     template<typename Mutex>
-    class shareable_lock;
+    class shared_lock;
 
     template<typename Mutex>
     class exclusive_lock;
 
     template<typename Mutex>
-    class upgradeable_lock;
+    class upgrade_lock;
 
     template<typename Mutex>
     class lock_guard
@@ -86,21 +86,21 @@ namespace boost
         {
             timed_lock(target_time);
         }
-        unique_lock(boost::move_t<unique_lock> other):
+        unique_lock(boost::move_t<unique_lock<Mutex> > other):
             m(other->m),is_locked(other->is_locked)
         {
             other->is_locked=false;
         }
-        unique_lock(boost::move_t<upgradeable_lock<Mutex> > other);
+        unique_lock(boost::move_t<upgrade_lock<Mutex> > other);
 
-        unique_lock& operator=(boost::move_t<unique_lock> other)
+        unique_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
         {
             unique_lock temp(other);
             swap(temp);
             return *this;
         }
 
-        unique_lock& operator=(boost::move_t<upgradeable_lock<Mutex> > other)
+        unique_lock& operator=(boost::move_t<upgrade_lock<Mutex> > other)
         {
             unique_lock temp(other);
             swap(temp);
@@ -112,7 +112,7 @@ namespace boost
             std::swap(m,other.m);
             std::swap(is_locked,other.is_locked);
         }
-        void swap(boost::move_t<unique_lock> other)
+        void swap(boost::move_t<unique_lock<Mutex> > other)
         {
             std::swap(m,other->m);
             std::swap(is_locked,other->is_locked);
@@ -170,6 +170,10 @@ namespace boost
         {
             return is_locked?&unique_lock::lock:0;
         }
+        bool operator!() const
+        {
+            return !owns_lock();
+        }
         bool owns_lock() const
         {
             return is_locked;
@@ -188,91 +192,100 @@ namespace boost
             return res;
         }
 
-        friend class shareable_lock<Mutex>;
-        friend class upgradeable_lock<Mutex>;
+        friend class shared_lock<Mutex>;
+        friend class upgrade_lock<Mutex>;
     };
 
     template<typename Mutex>
-    class shareable_lock
+    class shared_lock
     {
     protected:
         Mutex* m;
         bool is_locked;
     private:
-        explicit shareable_lock(shareable_lock&);
-        shareable_lock& operator=(shareable_lock&);
+        explicit shared_lock(shared_lock&);
+        shared_lock& operator=(shared_lock&);
     public:
-        explicit shareable_lock(Mutex& m_):
+        explicit shared_lock(Mutex& m_):
             m(&m_),is_locked(false)
         {
             lock();
         }
-        shareable_lock(Mutex& m_,bool do_lock):
+        shared_lock(Mutex& m_,adopt_lock_t):
+            m(&m_),is_locked(true)
+        {}
+        shared_lock(Mutex& m_,defer_lock_t):
+            m(&m_),is_locked(false)
+        {}
+        shared_lock(Mutex& m_,try_to_lock_t):
             m(&m_),is_locked(false)
         {
-            if(do_lock)
-            {
-                lock();
-            }
+            try_lock();
         }
-        shareable_lock(boost::move_t<shareable_lock> other):
+        shared_lock(Mutex& m_,system_time const& target_time):
+            m(&m_),is_locked(false)
+        {
+            timed_lock(target_time);
+        }
+
+        shared_lock(boost::move_t<shared_lock<Mutex> > other):
             m(other->m),is_locked(other->is_locked)
         {
             other->is_locked=false;
         }
 
-        shareable_lock(boost::move_t<unique_lock<Mutex> > other):
+        shared_lock(boost::move_t<unique_lock<Mutex> > other):
             m(other->m),is_locked(other->is_locked)
         {
             other->is_locked=false;
             if(is_locked)
             {
-                m->unlock_and_lock_shareable();
+                m->unlock_and_lock_shared();
             }
         }
 
-        shareable_lock(boost::move_t<upgradeable_lock<Mutex> > other):
+        shared_lock(boost::move_t<upgrade_lock<Mutex> > other):
             m(other->m),is_locked(other->is_locked)
         {
             other->is_locked=false;
             if(is_locked)
             {
-                m->unlock_upgradeable_and_lock_shareable();
+                m->unlock_upgrade_and_lock_shared();
             }
         }
 
-        shareable_lock& operator=(boost::move_t<shareable_lock> other)
+        shared_lock& operator=(boost::move_t<shared_lock<Mutex> > other)
         {
-            shareable_lock temp(other);
+            shared_lock temp(other);
             swap(temp);
             return *this;
         }
 
-        shareable_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
+        shared_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
         {
-            shareable_lock temp(other);
+            shared_lock temp(other);
             swap(temp);
             return *this;
         }
 
-        shareable_lock& operator=(boost::move_t<upgradeable_lock<Mutex> > other)
+        shared_lock& operator=(boost::move_t<upgrade_lock<Mutex> > other)
         {
-            shareable_lock temp(other);
+            shared_lock temp(other);
             swap(temp);
             return *this;
         }
 
-        void swap(shareable_lock& other)
+        void swap(shared_lock& other)
         {
             std::swap(m,other.m);
             std::swap(is_locked,other.is_locked);
         }
         
-        ~shareable_lock()
+        ~shared_lock()
         {
             if(owns_lock())
             {
-                m->unlock_shareable();
+                m->unlock_shared();
             }
         }
         void lock()
@@ -281,7 +294,7 @@ namespace boost
             {
                 throw boost::lock_error();
             }
-            m->lock_shareable();
+            m->lock_shared();
             is_locked=true;
         }
         bool try_lock()
@@ -290,7 +303,16 @@ namespace boost
             {
                 throw boost::lock_error();
             }
-            is_locked=m->try_lock_shareable();
+            is_locked=m->try_lock_shared();
+            return is_locked;
+        }
+        bool timed_lock(boost::system_time const& target_time)
+        {
+            if(owns_lock())
+            {
+                throw boost::lock_error();
+            }
+            is_locked=m->timed_lock_shared(target_time);
             return is_locked;
         }
         void unlock()
@@ -299,14 +321,18 @@ namespace boost
             {
                 throw boost::lock_error();
             }
-            m->unlock_shareable();
+            m->unlock_shared();
             is_locked=false;
         }
             
-        typedef void (shareable_lock::*bool_type)();
+        typedef void (shared_lock::*bool_type)();
         operator bool_type() const
         {
-            return is_locked?&shareable_lock::lock:0;
+            return is_locked?&shared_lock::lock:0;
+        }
+        bool operator!() const
+        {
+            return !owns_lock();
         }
         bool owns_lock() const
         {
@@ -316,21 +342,21 @@ namespace boost
     };
 
     template<typename Mutex>
-    class upgradeable_lock
+    class upgrade_lock
     {
     protected:
         Mutex* m;
         bool is_locked;
     private:
-        explicit upgradeable_lock(upgradeable_lock&);
-        upgradeable_lock& operator=(upgradeable_lock&);
+        explicit upgrade_lock(upgrade_lock&);
+        upgrade_lock& operator=(upgrade_lock&);
     public:
-        explicit upgradeable_lock(Mutex& m_):
+        explicit upgrade_lock(Mutex& m_):
             m(&m_),is_locked(false)
         {
             lock();
         }
-        upgradeable_lock(Mutex& m_,bool do_lock):
+        upgrade_lock(Mutex& m_,bool do_lock):
             m(&m_),is_locked(false)
         {
             if(do_lock)
@@ -338,47 +364,47 @@ namespace boost
                 lock();
             }
         }
-        upgradeable_lock(boost::move_t<upgradeable_lock> other):
+        upgrade_lock(boost::move_t<upgrade_lock<Mutex> > other):
             m(other->m),is_locked(other->is_locked)
         {
             other->is_locked=false;
         }
 
-        upgradeable_lock(boost::move_t<unique_lock<Mutex> > other):
+        upgrade_lock(boost::move_t<unique_lock<Mutex> > other):
             m(other->m),is_locked(other->is_locked)
         {
             other->is_locked=false;
             if(is_locked)
             {
-                m->unlock_and_lock_upgradeable();
+                m->unlock_and_lock_upgrade();
             }
         }
 
-        upgradeable_lock& operator=(boost::move_t<upgradeable_lock> other)
+        upgrade_lock& operator=(boost::move_t<upgrade_lock<Mutex> > other)
         {
-            upgradeable_lock temp(other);
+            upgrade_lock temp(other);
             swap(temp);
             return *this;
         }
 
-        upgradeable_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
+        upgrade_lock& operator=(boost::move_t<unique_lock<Mutex> > other)
         {
-            upgradeable_lock temp(other);
+            upgrade_lock temp(other);
             swap(temp);
             return *this;
         }
 
-        void swap(upgradeable_lock& other)
+        void swap(upgrade_lock& other)
         {
             std::swap(m,other.m);
             std::swap(is_locked,other.is_locked);
         }
         
-        ~upgradeable_lock()
+        ~upgrade_lock()
         {
             if(owns_lock())
             {
-                m->unlock_upgradeable();
+                m->unlock_upgrade();
             }
         }
         void lock()
@@ -387,7 +413,7 @@ namespace boost
             {
                 throw boost::lock_error();
             }
-            m->lock_upgradeable();
+            m->lock_upgrade();
             is_locked=true;
         }
         bool try_lock()
@@ -396,7 +422,7 @@ namespace boost
             {
                 throw boost::lock_error();
             }
-            is_locked=m->try_lock_upgradeable();
+            is_locked=m->try_lock_upgrade();
             return is_locked;
         }
         void unlock()
@@ -405,31 +431,35 @@ namespace boost
             {
                 throw boost::lock_error();
             }
-            m->unlock_upgradeable();
+            m->unlock_upgrade();
             is_locked=false;
         }
             
-        typedef void (upgradeable_lock::*bool_type)();
+        typedef void (upgrade_lock::*bool_type)();
         operator bool_type() const
         {
-            return is_locked?&upgradeable_lock::lock:0;
+            return is_locked?&upgrade_lock::lock:0;
+        }
+        bool operator!() const
+        {
+            return !owns_lock();
         }
         bool owns_lock() const
         {
             return is_locked;
         }
-        friend class shareable_lock<Mutex>;
+        friend class shared_lock<Mutex>;
         friend class unique_lock<Mutex>;
     };
 
     template<typename Mutex>
-    unique_lock<Mutex>::unique_lock(boost::move_t<upgradeable_lock<Mutex> > other):
+    unique_lock<Mutex>::unique_lock(boost::move_t<upgrade_lock<Mutex> > other):
         m(other->m),is_locked(other->is_locked)
     {
         other->is_locked=false;
         if(is_locked)
         {
-            m->unlock_upgradeable_and_lock();
+            m->unlock_upgrade_and_lock();
         }
     }
 
@@ -437,13 +467,13 @@ namespace boost
     class upgrade_to_unique_lock
     {
     private:
-        upgradeable_lock<Mutex>* source;
+        upgrade_lock<Mutex>* source;
         unique_lock<Mutex> exclusive;
 
         explicit upgrade_to_unique_lock(upgrade_to_unique_lock&);
         upgrade_to_unique_lock& operator=(upgrade_to_unique_lock&);
     public:
-        explicit upgrade_to_unique_lock(upgradeable_lock<Mutex>& m_):
+        explicit upgrade_to_unique_lock(upgrade_lock<Mutex>& m_):
             source(&m_),exclusive(boost::move(*source))
         {}
         ~upgrade_to_unique_lock()
@@ -454,13 +484,13 @@ namespace boost
             }
         }
 
-        upgrade_to_unique_lock(boost::move_t<upgrade_to_unique_lock> other):
+        upgrade_to_unique_lock(boost::move_t<upgrade_to_unique_lock<Mutex> > other):
             source(other->source),exclusive(boost::move(other->exclusive))
         {
             other->source=0;
         }
         
-        upgrade_to_unique_lock& operator=(boost::move_t<upgrade_to_unique_lock> other)
+        upgrade_to_unique_lock& operator=(boost::move_t<upgrade_to_unique_lock<Mutex> > other)
         {
             upgrade_to_unique_lock temp(other);
             swap(temp);
@@ -476,6 +506,10 @@ namespace boost
         {
             return exclusive.owns_lock()?&upgrade_to_unique_lock::swap:0;
         }
+        bool operator!() const
+        {
+            return !owns_lock();
+        }
         bool owns_lock() const
         {
             return exclusive.owns_lock();
diff --git a/include/boost/thread/pthread/shared_mutex.hpp b/include/boost/thread/pthread/shared_mutex.hpp
new file mode 100644
index 00000000..673cfc00
--- /dev/null
+++ b/include/boost/thread/pthread/shared_mutex.hpp
@@ -0,0 +1,300 @@
+#ifndef BOOST_THREAD_PTHREAD_SHARED_MUTEX_HPP
+#define BOOST_THREAD_PTHREAD_SHARED_MUTEX_HPP
+
+//  (C) Copyright 2006-7 Anthony Williams
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/assert.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/thread/xtime.hpp>
+
+namespace boost
+{
+    class shared_mutex
+    {
+    private:
+        struct state_data
+        {
+            unsigned shared_count;
+            bool exclusive;
+            bool upgrade;
+            bool exclusive_waiting_blocked;
+        };
+        
+
+
+        state_data state;
+        boost::mutex state_change;
+        boost::condition shared_cond;
+        boost::condition exclusive_cond;
+        boost::condition upgrade_cond;
+
+        void release_waiters()
+        {
+            exclusive_cond.notify_one();
+            shared_cond.notify_all();
+        }
+        
+
+    public:
+        shared_mutex()
+        {
+            state_data state_={0};
+            state=state_;
+        }
+
+        ~shared_mutex()
+        {
+        }
+
+        void lock_shared()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+                
+            while(true)
+            {
+                if(!state.exclusive && !state.exclusive_waiting_blocked)
+                {
+                    ++state.shared_count;
+                    return;
+                }
+                
+                shared_cond.wait(lock);
+            }
+        }
+
+        bool try_lock_shared()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+                
+            if(state.exclusive || state.exclusive_waiting_blocked)
+            {
+                return false;
+            }
+            else
+            {
+                ++state.shared_count;
+                return true;
+            }
+        }
+
+        bool timed_lock_shared(system_time const& timeout)
+        {
+            boost::mutex::scoped_lock lock(state_change);
+                
+            while(true)
+            {
+                if(!state.exclusive && !state.exclusive_waiting_blocked)
+                {
+                    ++state.shared_count;
+                    return true;
+                }
+                
+                if(!shared_cond.timed_wait(lock,get_xtime(timeout)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        void unlock_shared()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            bool const last_reader=!--state.shared_count;
+                
+            if(last_reader)
+            {
+                if(state.upgrade)
+                {
+                    state.upgrade=false;
+                    state.exclusive=true;
+                    upgrade_cond.notify_one();
+                }
+                else
+                {
+                    state.exclusive_waiting_blocked=false;
+                }
+                release_waiters();
+            }
+        }
+
+        void lock()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+                
+            while(true)
+            {
+                if(state.shared_count || state.exclusive)
+                {
+                    state.exclusive_waiting_blocked=true;
+                }
+                else
+                {
+                    state.exclusive=true;
+                    return;
+                }
+                exclusive_cond.wait(lock);
+            }
+        }
+
+        bool timed_lock(system_time const& timeout)
+        {
+            boost::mutex::scoped_lock lock(state_change);
+                
+            while(true)
+            {
+                if(state.shared_count || state.exclusive)
+                {
+                    state.exclusive_waiting_blocked=true;
+                }
+                else
+                {
+                    state.exclusive=true;
+                    return true;
+                }
+                if(!exclusive_cond.timed_wait(lock,get_xtime(timeout)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        bool try_lock()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+                
+            if(state.shared_count || state.exclusive)
+            {
+                return false;
+            }
+            else
+            {
+                state.exclusive=true;
+                return true;
+            }
+                
+        }
+
+        void unlock()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            state.exclusive=false;
+            state.exclusive_waiting_blocked=false;
+            release_waiters();
+        }
+
+        void lock_upgrade()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            while(true)
+            {
+                if(!state.exclusive && !state.exclusive_waiting_blocked && !state.upgrade)
+                {
+                    ++state.shared_count;
+                    state.upgrade=true;
+                    return;
+                }
+                
+                shared_cond.wait(lock);
+            }
+        }
+
+        bool timed_lock_upgrade(system_time const& timeout)
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            while(true)
+            {
+                if(!state.exclusive && !state.exclusive_waiting_blocked && !state.upgrade)
+                {
+                    ++state.shared_count;
+                    state.upgrade=true;
+                    return true;
+                }
+                
+                if(!shared_cond.timed_wait(lock,get_xtime(timeout)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        bool try_lock_upgrade()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            if(state.exclusive || state.exclusive_waiting_blocked || state.upgrade)
+            {
+                return false;
+            }
+            else
+            {
+                ++state.shared_count;
+                state.upgrade=true;
+                return true;
+            }
+        }
+
+        void unlock_upgrade()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            state.upgrade=false;
+            bool const last_reader=!--state.shared_count;
+                
+            if(last_reader)
+            {
+                state.exclusive_waiting_blocked=false;
+                release_waiters();
+            }
+        }
+
+        void unlock_upgrade_and_lock()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            --state.shared_count;
+            while(true)
+            {
+                if(!state.shared_count)
+                {
+                    state.upgrade=false;
+                    state.exclusive=true;
+                    break;
+                }
+                upgrade_cond.wait(lock);
+            }
+        }
+
+        void unlock_and_lock_upgrade()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            state.exclusive=false;
+            state.upgrade=true;
+            ++state.shared_count;
+            state.exclusive_waiting_blocked=false;
+            release_waiters();
+        }
+        
+        void unlock_and_lock_shared()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            state.exclusive=false;
+            ++state.shared_count;
+            state.exclusive_waiting_blocked=false;
+            release_waiters();
+        }
+        
+        void unlock_upgrade_and_lock_shared()
+        {
+            boost::mutex::scoped_lock lock(state_change);
+            state.upgrade=false;
+            state.exclusive_waiting_blocked=false;
+            release_waiters();
+        }
+    };
+}
+
+
+#endif
diff --git a/include/boost/thread/shared_mutex.hpp b/include/boost/thread/shared_mutex.hpp
new file mode 100644
index 00000000..17f72d84
--- /dev/null
+++ b/include/boost/thread/shared_mutex.hpp
@@ -0,0 +1,15 @@
+#ifndef BOOST_THREAD_SHARED_MUTEX_HPP
+#define BOOST_THREAD_SHARED_MUTEX_HPP
+
+//  shared_mutex.hpp
+//
+//  (C) Copyright 2007 Anthony Williams 
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/thread/detail/platform.hpp>
+#include BOOST_THREAD_PLATFORM(shared_mutex.hpp)
+
+#endif
diff --git a/include/boost/thread/thread_time.hpp b/include/boost/thread/thread_time.hpp
index 8c735977..017a112f 100644
--- a/include/boost/thread/thread_time.hpp
+++ b/include/boost/thread/thread_time.hpp
@@ -30,7 +30,7 @@ namespace boost
             {
                 return 0;
             }
-            return (target_time-now).total_milliseconds();
+            return (target_time-now).total_milliseconds()+1;
         }
 
     }
diff --git a/include/boost/thread/win32/shared_mutex.hpp b/include/boost/thread/win32/shared_mutex.hpp
new file mode 100644
index 00000000..2b0cf8d8
--- /dev/null
+++ b/include/boost/thread/win32/shared_mutex.hpp
@@ -0,0 +1,516 @@
+#ifndef BOOST_THREAD_WIN32_SHARED_MUTEX_HPP
+#define BOOST_THREAD_WIN32_SHARED_MUTEX_HPP
+
+//  (C) Copyright 2006-7 Anthony Williams
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/assert.hpp>
+#include <boost/detail/interlocked.hpp>
+#include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/static_assert.hpp>
+#include <limits.h>
+#include <boost/utility.hpp>
+#include <boost/thread/thread_time.hpp>
+
+namespace boost
+{
+    class shared_mutex:
+        private boost::noncopyable
+    {
+    private:
+        struct state_data
+        {
+            unsigned shared_count:11;
+            unsigned shared_waiting:11;
+            unsigned exclusive:1;
+            unsigned upgrade:1;
+            unsigned exclusive_waiting:7;
+            unsigned exclusive_waiting_blocked:1;
+
+            friend bool operator==(state_data const& lhs,state_data const& rhs)
+            {
+                return *reinterpret_cast<unsigned const*>(&lhs)==*reinterpret_cast<unsigned const*>(&rhs);
+            }
+        };
+        
+
+        template<typename T>
+        T interlocked_compare_exchange(T* target,T new_value,T comparand)
+        {
+            BOOST_STATIC_ASSERT(sizeof(T)==sizeof(long));
+            long const res=BOOST_INTERLOCKED_COMPARE_EXCHANGE(reinterpret_cast<long*>(target),
+                                                              *reinterpret_cast<long*>(&new_value),
+                                                              *reinterpret_cast<long*>(&comparand));
+            return *reinterpret_cast<T const*>(&res);
+        }
+
+        state_data state;
+        void* semaphores[2];
+        void* &unlock_sem;
+        void* &exclusive_sem;
+        void* upgrade_sem;
+
+        void release_waiters(state_data old_state)
+        {
+            if(old_state.exclusive_waiting)
+            {
+                bool const success=detail::win32::ReleaseSemaphore(exclusive_sem,1,NULL)!=0;
+                BOOST_ASSERT(success);
+            }
+                        
+            if(old_state.shared_waiting || old_state.exclusive_waiting)
+            {
+                bool const success=detail::win32::ReleaseSemaphore(unlock_sem,old_state.shared_waiting + (old_state.exclusive_waiting?1:0),NULL)!=0;
+                BOOST_ASSERT(success);
+            }
+        }
+        
+
+    public:
+        shared_mutex():
+            unlock_sem(semaphores[0]),
+            exclusive_sem(semaphores[1]) 
+        {
+            unlock_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
+            exclusive_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
+            upgrade_sem=detail::win32::create_anonymous_semaphore(0,LONG_MAX);
+            state_data state_={0};
+            state=state_;
+        }
+
+        ~shared_mutex()
+        {
+            detail::win32::CloseHandle(upgrade_sem);
+            detail::win32::CloseHandle(unlock_sem);
+            detail::win32::CloseHandle(exclusive_sem);
+        }
+
+        bool try_lock_shared()
+        {
+            state_data old_state=state;
+            do
+            {
+                state_data new_state=old_state;
+                if(!new_state.exclusive && !new_state.exclusive_waiting_blocked)
+                {
+                    ++new_state.shared_count;
+                }
+                
+                state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                if(current_state==old_state)
+                {
+                    break;
+                }
+                old_state=current_state;
+            }
+            while(true);
+            return !(old_state.exclusive| old_state.exclusive_waiting_blocked);
+        }
+
+        void lock_shared()
+        {
+            bool const success=timed_lock_shared(::boost::detail::get_system_time_sentinel());
+            BOOST_ASSERT(success);
+        }
+
+        bool timed_lock_shared(boost::system_time const& wait_until)
+        {
+            while(true)
+            {
+                state_data old_state=state;
+                do
+                {
+                    state_data new_state=old_state;
+                    if(new_state.exclusive || new_state.exclusive_waiting_blocked)
+                    {
+                        ++new_state.shared_waiting;
+                    }
+                    else
+                    {
+                        ++new_state.shared_count;
+                    }
+
+                    state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                    if(current_state==old_state)
+                    {
+                        break;
+                    }
+                    old_state=current_state;
+                }
+                while(true);
+
+                if(!(old_state.exclusive| old_state.exclusive_waiting_blocked))
+                {
+                    return true;
+                }
+                    
+                unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,::boost::detail::get_milliseconds_until(wait_until));
+                if(res==detail::win32::timeout)
+                {
+                    do
+                    {
+                        state_data new_state=old_state;
+                        if(new_state.exclusive || new_state.exclusive_waiting_blocked)
+                        {
+                            if(new_state.shared_waiting)
+                            {
+                                --new_state.shared_waiting;
+                            }
+                        }
+                        else
+                        {
+                            ++new_state.shared_count;
+                        }
+
+                        state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                        if(current_state==old_state)
+                        {
+                            break;
+                        }
+                        old_state=current_state;
+                    }
+                    while(true);
+
+                    if(!(old_state.exclusive| old_state.exclusive_waiting_blocked))
+                    {
+                        return true;
+                    }
+                    return false;
+                }
+                
+                BOOST_ASSERT(res==0);
+            }
+        }
+
+        void unlock_shared()
+        {
+            state_data old_state=state;
+            do
+            {
+                state_data new_state=old_state;
+                bool const last_reader=!--new_state.shared_count;
+                
+                if(last_reader)
+                {
+                    if(new_state.upgrade)
+                    {
+                        new_state.upgrade=false;
+                        new_state.exclusive=true;
+                    }
+                    else
+                    {
+                        if(new_state.exclusive_waiting)
+                        {
+                            --new_state.exclusive_waiting;
+                            new_state.exclusive_waiting_blocked=false;
+                        }
+                        new_state.shared_waiting=0;
+                    }
+                }
+                
+                state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                if(current_state==old_state)
+                {
+                    if(last_reader)
+                    {
+                        if(old_state.upgrade)
+                        {
+                            bool const success=detail::win32::ReleaseSemaphore(upgrade_sem,1,NULL)!=0;
+                            BOOST_ASSERT(success);
+                        }
+                        else
+                        {
+                            release_waiters(old_state);
+                        }
+                    }
+                    break;
+                }
+                old_state=current_state;
+            }
+            while(true);
+        }
+
+        void lock()
+        {
+            bool const success=timed_lock(::boost::detail::get_system_time_sentinel());
+            BOOST_ASSERT(success);
+        }
+
+        bool timed_lock(boost::system_time const& wait_until)
+        {
+            while(true)
+            {
+                state_data old_state=state;
+
+                do
+                {
+                    state_data new_state=old_state;
+                    if(new_state.shared_count || new_state.exclusive)
+                    {
+                        ++new_state.exclusive_waiting;
+                        new_state.exclusive_waiting_blocked=true;
+                    }
+                    else
+                    {
+                        new_state.exclusive=true;
+                    }
+
+                    state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                    if(current_state==old_state)
+                    {
+                        break;
+                    }
+                    old_state=current_state;
+                }
+                while(true);
+
+                if(!old_state.shared_count && !old_state.exclusive)
+                {
+                    return true;
+                }
+                unsigned long const wait_res=detail::win32::WaitForMultipleObjects(2,semaphores,true,::boost::detail::get_milliseconds_until(wait_until));
+                if(wait_res==detail::win32::timeout)
+                {
+                    do
+                    {
+                        state_data new_state=old_state;
+                        if(new_state.shared_count || new_state.exclusive)
+                        {
+                            if(new_state.exclusive_waiting)
+                            {
+                                --new_state.exclusive_waiting;
+                            }
+                        }
+                        else
+                        {
+                            new_state.exclusive=true;
+                        }
+
+                        state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                        if(current_state==old_state)
+                        {
+                            break;
+                        }
+                        old_state=current_state;
+                    }
+                    while(true);
+                    if(!old_state.shared_count && !old_state.exclusive)
+                    {
+                        return true;
+                    }
+                    return false;
+                }
+                BOOST_ASSERT(wait_res<2);
+            }
+        }
+
+        void unlock()
+        {
+            state_data old_state=state;
+            do
+            {
+                state_data new_state=old_state;
+                new_state.exclusive=false;
+                if(new_state.exclusive_waiting)
+                {
+                    --new_state.exclusive_waiting;
+                    new_state.exclusive_waiting_blocked=false;
+                }
+                new_state.shared_waiting=0;
+
+                state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                if(current_state==old_state)
+                {
+                    break;
+                }
+                old_state=current_state;
+            }
+            while(true);
+            release_waiters(old_state);
+        }
+
+        void lock_upgrade()
+        {
+            while(true)
+            {
+                state_data old_state=state;
+                do
+                {
+                    state_data new_state=old_state;
+                    if(new_state.exclusive || new_state.exclusive_waiting_blocked || new_state.upgrade)
+                    {
+                        ++new_state.shared_waiting;
+                    }
+                    else
+                    {
+                        ++new_state.shared_count;
+                        new_state.upgrade=true;
+                    }
+
+                    state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                    if(current_state==old_state)
+                    {
+                        break;
+                    }
+                    old_state=current_state;
+                }
+                while(true);
+
+                if(!(old_state.exclusive|| old_state.exclusive_waiting_blocked|| old_state.upgrade))
+                {
+                    return;
+                }
+                    
+                unsigned long const res=detail::win32::WaitForSingleObject(unlock_sem,detail::win32::infinite);
+                BOOST_ASSERT(res==0);
+            }
+        }
+
+        void unlock_upgrade()
+        {
+            state_data old_state=state;
+            do
+            {
+                state_data new_state=old_state;
+                new_state.upgrade=false;
+                bool const last_reader=!--new_state.shared_count;
+                
+                if(last_reader)
+                {
+                    if(new_state.exclusive_waiting)
+                    {
+                        --new_state.exclusive_waiting;
+                        new_state.exclusive_waiting_blocked=false;
+                    }
+                    new_state.shared_waiting=0;
+                }
+                
+                state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                if(current_state==old_state)
+                {
+                    if(last_reader)
+                    {
+                        release_waiters(old_state);
+                    }
+                    break;
+                }
+                old_state=current_state;
+            }
+            while(true);
+        }
+
+        void unlock_upgrade_and_lock()
+        {
+            state_data old_state=state;
+            do
+            {
+                state_data new_state=old_state;
+                bool const last_reader=!--new_state.shared_count;
+                
+                if(last_reader)
+                {
+                    new_state.upgrade=false;
+                    new_state.exclusive=true;
+                }
+                
+                state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                if(current_state==old_state)
+                {
+                    if(!last_reader)
+                    {
+                        unsigned long const res=detail::win32::WaitForSingleObject(upgrade_sem,detail::win32::infinite);
+                        BOOST_ASSERT(res==0);
+                    }
+                    break;
+                }
+                old_state=current_state;
+            }
+            while(true);
+        }
+
+        void unlock_and_lock_upgrade()
+        {
+            state_data old_state=state;
+            do
+            {
+                state_data new_state=old_state;
+                new_state.exclusive=false;
+                new_state.upgrade=true;
+                ++new_state.shared_count;
+                if(new_state.exclusive_waiting)
+                {
+                    --new_state.exclusive_waiting;
+                    new_state.exclusive_waiting_blocked=false;
+                }
+                new_state.shared_waiting=0;
+
+                state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                if(current_state==old_state)
+                {
+                    break;
+                }
+                old_state=current_state;
+            }
+            while(true);
+            release_waiters(old_state);
+        }
+        
+        void unlock_and_lock_shared()
+        {
+            state_data old_state=state;
+            do
+            {
+                state_data new_state=old_state;
+                new_state.exclusive=false;
+                ++new_state.shared_count;
+                if(new_state.exclusive_waiting)
+                {
+                    --new_state.exclusive_waiting;
+                    new_state.exclusive_waiting_blocked=false;
+                }
+                new_state.shared_waiting=0;
+
+                state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                if(current_state==old_state)
+                {
+                    break;
+                }
+                old_state=current_state;
+            }
+            while(true);
+            release_waiters(old_state);
+        }
+        
+        void unlock_upgrade_and_lock_shared()
+        {
+            state_data old_state=state;
+            do
+            {
+                state_data new_state=old_state;
+                new_state.upgrade=false;
+                if(new_state.exclusive_waiting)
+                {
+                    --new_state.exclusive_waiting;
+                    new_state.exclusive_waiting_blocked=false;
+                }
+                new_state.shared_waiting=0;
+
+                state_data const current_state=interlocked_compare_exchange(&state,new_state,old_state);
+                if(current_state==old_state)
+                {
+                    break;
+                }
+                old_state=current_state;
+            }
+            while(true);
+            release_waiters(old_state);
+        }
+        
+    };
+}
+
+
+#endif
diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
index 6ada6ae4..604263e1 100644
--- a/include/boost/thread/win32/thread_primitives.hpp
+++ b/include/boost/thread/win32/thread_primitives.hpp
@@ -112,7 +112,7 @@ namespace boost
             
             inline handle create_anonymous_event(event_type type,initial_event_state state)
             {
-                handle const res=CreateEventA(0,type,state,0);
+                handle const res=win32::CreateEventA(0,type,state,0);
                 if(!res)
                 {
                     throw thread_resource_error();
@@ -177,6 +177,7 @@ namespace boost
                 {
                     cleanup();
                     handle_to_manage=new_handle;
+                    return *this;
                 }
 
                 operator handle() const
diff --git a/include/boost/thread/xtime.hpp b/include/boost/thread/xtime.hpp
index 5f66c629..a8fa1c9f 100644
--- a/include/boost/thread/xtime.hpp
+++ b/include/boost/thread/xtime.hpp
@@ -10,6 +10,8 @@
 #include <boost/thread/detail/config.hpp>
 
 #include <boost/cstdint.hpp>
+#include <boost/thread/thread_time.hpp>
+#include <boost/date_time/posix_time/conversion.hpp>
 
 namespace boost {
 
@@ -49,6 +51,16 @@ inline int xtime_cmp(const xtime& xt1, const xtime& xt2)
         return (xt1.sec > xt2.sec) ? 1 : -1;
 }
 
+inline xtime get_xtime(boost::system_time const& abs_time)
+{
+    xtime res={0};
+    boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0);
+            
+    res.sec=time_since_epoch.total_seconds();
+    res.nsec=time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second());
+    return res;
+}
+
 } // namespace boost
 
 #endif //BOOST_XTIME_WEK070601_HPP
diff --git a/src/mutex.cpp b/src/mutex.cpp
deleted file mode 100644
index bb73b9ce..00000000
--- a/src/mutex.cpp
+++ /dev/null
@@ -1,561 +0,0 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/xtime.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/exceptions.hpp>
-#include <boost/limits.hpp>
-#include <string>
-#include <stdexcept>
-#include <cassert>
-#include "timeconv.inl"
-
-#if defined(BOOST_HAS_WINTHREADS)
-#   include <new>
-#   include <boost/thread/once.hpp>
-#   include <windows.h>
-#   include <time.h>
-#   include "mutex.inl"
-#elif defined(BOOST_HAS_PTHREADS)
-#   include <errno.h>
-#elif defined(BOOST_HAS_MPTASKS)
-#    include <MacErrors.h>
-#    include "mac/init.hpp"
-#    include "mac/safe.hpp"
-#endif
-
-namespace boost {
-
-#if defined(BOOST_HAS_WINTHREADS)
-
-mutex::mutex()
-    : m_mutex(0)
-    , m_critical_section(false)
-{
-    m_critical_section = true;
-    if (m_critical_section)
-        m_mutex = new_critical_section();
-    else
-        m_mutex = new_mutex(0);
-}
-
-mutex::~mutex()
-{
-    if (m_critical_section)
-        delete_critical_section(m_mutex);
-    else
-        delete_mutex(m_mutex);
-}
-
-void mutex::do_lock()
-{
-    if (m_critical_section)
-        wait_critical_section_infinite(m_mutex);
-    else
-        wait_mutex(m_mutex, INFINITE);
-}
-
-void mutex::do_unlock()
-{
-    if (m_critical_section)
-        release_critical_section(m_mutex);
-    else
-        release_mutex(m_mutex);
-}
-
-void mutex::do_lock(cv_state&)
-{
-    do_lock();
-}
-
-void mutex::do_unlock(cv_state&)
-{
-    do_unlock();
-}
-
-try_mutex::try_mutex()
-    : m_mutex(0)
-    , m_critical_section(false)
-{
-    m_critical_section = has_TryEnterCriticalSection();
-    if (m_critical_section)
-        m_mutex = new_critical_section();
-    else
-        m_mutex = new_mutex(0);
-}
-
-try_mutex::~try_mutex()
-{
-    if (m_critical_section)
-        delete_critical_section(m_mutex);
-    else
-        delete_mutex(m_mutex);
-}
-
-void try_mutex::do_lock()
-{
-    if (m_critical_section)
-        wait_critical_section_infinite(m_mutex);
-    else
-        wait_mutex(m_mutex, INFINITE);
-}
-
-bool try_mutex::do_trylock()
-{
-    if (m_critical_section)
-        return wait_critical_section_try(m_mutex);
-    else
-        return wait_mutex(m_mutex, 0) == WAIT_OBJECT_0;
-}
-
-void try_mutex::do_unlock()
-{
-    if (m_critical_section)
-        release_critical_section(m_mutex);
-    else
-        release_mutex(m_mutex);
-}
-
-void try_mutex::do_lock(cv_state&)
-{
-    do_lock();
-}
-
-void try_mutex::do_unlock(cv_state&)
-{
-    do_unlock();
-}
-
-timed_mutex::timed_mutex()
-    : m_mutex(0)
-{
-    m_mutex = new_mutex(0);
-}
-
-timed_mutex::~timed_mutex()
-{
-    delete_mutex(m_mutex);
-}
-
-void timed_mutex::do_lock()
-{
-    wait_mutex(m_mutex, INFINITE);
-}
-
-bool timed_mutex::do_trylock()
-{
-    return wait_mutex(m_mutex, 0) == WAIT_OBJECT_0;
-}
-
-bool timed_mutex::do_timedlock(const xtime& xt)
-{
-    for (;;)
-    {
-        int milliseconds;
-        to_duration(xt, milliseconds);
-
-        int res = wait_mutex(m_mutex, milliseconds);
-
-        if (res == WAIT_TIMEOUT)
-        {
-            boost::xtime cur;
-            boost::xtime_get(&cur, boost::TIME_UTC);
-            if (boost::xtime_cmp(xt, cur) > 0)
-                continue;
-        }
-
-        return res == WAIT_OBJECT_0;
-    }
-}
-
-void timed_mutex::do_unlock()
-{
-    release_mutex(m_mutex);
-}
-
-void timed_mutex::do_lock(cv_state&)
-{
-    do_lock();
-}
-
-void timed_mutex::do_unlock(cv_state&)
-{
-    do_unlock();
-}
-
-#elif defined(BOOST_HAS_PTHREADS)
-
-mutex::mutex()
-{
-    int res = 0;
-    res = pthread_mutex_init(&m_mutex, 0);
-    if (res != 0)
-        throw thread_resource_error();
-}
-
-mutex::~mutex()
-{
-    int res = 0;
-    res = pthread_mutex_destroy(&m_mutex);
-    assert(res == 0);
-}
-
-void mutex::do_lock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    if (res == EDEADLK) throw lock_error();
-    assert(res == 0);
-}
-
-void mutex::do_unlock()
-{
-    int res = 0;
-    res = pthread_mutex_unlock(&m_mutex);
-    if (res == EPERM) throw lock_error();
-    assert(res == 0);
-}
-
-void mutex::do_lock(cv_state&)
-{
-}
-
-void mutex::do_unlock(cv_state& state)
-{
-    state.pmutex = &m_mutex;
-}
-
-try_mutex::try_mutex()
-{
-    int res = 0;
-    res = pthread_mutex_init(&m_mutex, 0);
-    if (res != 0)
-        throw thread_resource_error();
-}
-
-try_mutex::~try_mutex()
-{
-    int res = 0;
-    res = pthread_mutex_destroy(&m_mutex);
-    assert(res == 0);
-}
-
-void try_mutex::do_lock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    if (res == EDEADLK) throw lock_error();
-    assert(res == 0);
-}
-
-bool try_mutex::do_trylock()
-{
-    int res = 0;
-    res = pthread_mutex_trylock(&m_mutex);
-    if (res == EDEADLK) throw lock_error();
-    assert(res == 0 || res == EBUSY);
-    return res == 0;
-}
-
-void try_mutex::do_unlock()
-{
-    int res = 0;
-    res = pthread_mutex_unlock(&m_mutex);
-    if (res == EPERM) throw lock_error();
-    assert(res == 0);
-}
-
-void try_mutex::do_lock(cv_state&)
-{
-}
-
-void try_mutex::do_unlock(cv_state& state)
-{
-    state.pmutex = &m_mutex;
-}
-
-timed_mutex::timed_mutex()
-    : m_locked(false)
-{
-    int res = 0;
-    res = pthread_mutex_init(&m_mutex, 0);
-    if (res != 0)
-        throw thread_resource_error();
-
-    res = pthread_cond_init(&m_condition, 0);
-    if (res != 0)
-    {
-        pthread_mutex_destroy(&m_mutex);
-        throw thread_resource_error();
-    }
-}
-
-timed_mutex::~timed_mutex()
-{
-    assert(!m_locked);
-    int res = 0;
-    res = pthread_mutex_destroy(&m_mutex);
-    assert(res == 0);
-
-    res = pthread_cond_destroy(&m_condition);
-    assert(res == 0);
-}
-
-void timed_mutex::do_lock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    while (m_locked)
-    {
-        res = pthread_cond_wait(&m_condition, &m_mutex);
-        assert(res == 0);
-    }
-
-    assert(!m_locked);
-    m_locked = true;
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-}
-
-bool timed_mutex::do_trylock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    bool ret = false;
-    if (!m_locked)
-    {
-        m_locked = true;
-        ret = true;
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-    return ret;
-}
-
-bool timed_mutex::do_timedlock(const xtime& xt)
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    timespec ts;
-    to_timespec(xt, ts);
-
-    while (m_locked)
-    {
-        res = pthread_cond_timedwait(&m_condition, &m_mutex, &ts);
-        assert(res == 0 || res == ETIMEDOUT);
-
-        if (res == ETIMEDOUT)
-            break;
-    }
-
-    bool ret = false;
-    if (!m_locked)
-    {
-        m_locked = true;
-        ret = true;
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-    return ret;
-}
-
-void timed_mutex::do_unlock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    assert(m_locked);
-    m_locked = false;
-
-    res = pthread_cond_signal(&m_condition);
-    assert(res == 0);
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-}
-
-void timed_mutex::do_lock(cv_state&)
-{
-    int res = 0;
-    while (m_locked)
-    {
-        res = pthread_cond_wait(&m_condition, &m_mutex);
-        assert(res == 0);
-    }
-
-    assert(!m_locked);
-    m_locked = true;
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-}
-
-void timed_mutex::do_unlock(cv_state& state)
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    assert(m_locked);
-    m_locked = false;
-
-    res = pthread_cond_signal(&m_condition);
-    assert(res == 0);
-
-    state.pmutex = &m_mutex;
-}
-
-#elif defined(BOOST_HAS_MPTASKS)
-
-using threads::mac::detail::safe_enter_critical_region;
-
-mutex::mutex()
-{
-}
-
-mutex::~mutex()
-{
-}
-
-void mutex::do_lock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-}
-
-void mutex::do_unlock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = MPExitCriticalRegion(m_mutex);
-    assert(lStatus == noErr);
-}
-
-void mutex::do_lock(cv_state& /*state*/)
-{
-    do_lock();
-}
-
-void mutex::do_unlock(cv_state& /*state*/)
-{
-    do_unlock();
-}
-
-try_mutex::try_mutex()
-{
-}
-
-try_mutex::~try_mutex()
-{
-}
-
-void try_mutex::do_lock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-}
-
-bool try_mutex::do_trylock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = MPEnterCriticalRegion(m_mutex, kDurationImmediate);
-    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
-    return lStatus == noErr;
-}
-
-void try_mutex::do_unlock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = MPExitCriticalRegion(m_mutex);
-    assert(lStatus == noErr);
-}
-
-void try_mutex::do_lock(cv_state& /*state*/)
-{
-    do_lock();
-}
-
-void try_mutex::do_unlock(cv_state& /*state*/)
-{
-    do_unlock();
-}
-
-timed_mutex::timed_mutex()
-{
-}
-
-timed_mutex::~timed_mutex()
-{
-}
-
-void timed_mutex::do_lock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-}
-
-bool timed_mutex::do_trylock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = MPEnterCriticalRegion(m_mutex, kDurationImmediate);
-    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
-    return(lStatus == noErr);
-}
-
-bool timed_mutex::do_timedlock(const xtime& xt)
-{
-    int microseconds;
-    to_microduration(xt, microseconds);
-    Duration lDuration = kDurationMicrosecond * microseconds;
-
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, lDuration, m_mutex_mutex);
-    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
-
-    return(lStatus == noErr);
-}
-
-void timed_mutex::do_unlock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = MPExitCriticalRegion(m_mutex);
-    assert(lStatus == noErr);
-}
-
-void timed_mutex::do_lock(cv_state& /*state*/)
-{
-    do_lock();
-}
-
-void timed_mutex::do_unlock(cv_state& /*state*/)
-{
-    do_unlock();
-}
-
-#endif
-
-} // namespace boost
-
-// Change Log:
-//   8 Feb 01  WEKEMPF Initial version.
diff --git a/src/mutex.inl b/src/mutex.inl
deleted file mode 100644
index b2c625e0..00000000
--- a/src/mutex.inl
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-// boostinspect:nounnamed
-
-namespace {
-
-#if defined(BOOST_HAS_WINTHREADS)
-//:PREVENT THIS FROM BEING DUPLICATED
-typedef BOOL (WINAPI* TryEnterCriticalSection_type)(LPCRITICAL_SECTION lpCriticalSection);
-TryEnterCriticalSection_type g_TryEnterCriticalSection = 0;
-boost::once_flag once_init_TryEnterCriticalSection = BOOST_ONCE_INIT;
-
-void init_TryEnterCriticalSection()
-{
-    //TryEnterCriticalSection is only available on WinNT 4.0 or later; 
-    //it is not available on Win9x.
-
-    OSVERSIONINFO version_info = {sizeof(OSVERSIONINFO)};
-    ::GetVersionEx(&version_info);
-    if (version_info.dwPlatformId == VER_PLATFORM_WIN32_NT && 
-        version_info.dwMajorVersion >= 4)
-    {
-        if (HMODULE kernel_module = GetModuleHandle(TEXT("KERNEL32.DLL")))
-        {
-            g_TryEnterCriticalSection = reinterpret_cast<TryEnterCriticalSection_type>(
-#if defined(BOOST_NO_ANSI_APIS)
-                GetProcAddressW(kernel_module, L"TryEnterCriticalSection")
-#else
-                GetProcAddress(kernel_module, "TryEnterCriticalSection")
-#endif        
-                );
-        }
-    }
-}
-
-inline bool has_TryEnterCriticalSection()
-{
-    boost::call_once(once_init_TryEnterCriticalSection, init_TryEnterCriticalSection);
-    return g_TryEnterCriticalSection != 0;
-}
-
-inline HANDLE mutex_cast(void* p)
-{
-    return reinterpret_cast<HANDLE>(p);
-}
-
-inline LPCRITICAL_SECTION critical_section_cast(void* p)
-{
-    return reinterpret_cast<LPCRITICAL_SECTION>(p);
-}
-
-inline void* new_critical_section()
-{
-    try
-    {
-        LPCRITICAL_SECTION critical_section = new CRITICAL_SECTION;
-        if (critical_section == 0) throw boost::thread_resource_error();
-        InitializeCriticalSection(critical_section);
-        return critical_section;
-    }
-    catch(...)
-    {
-        throw boost::thread_resource_error();
-    }
-}
-
-inline void* new_mutex(const char* name)
-{
-#if defined(BOOST_NO_ANSI_APIS)
-    int const num_wide_chars = ::MultiByteToWideChar(CP_ACP, 0, name, -1, 0, 0);
-    LPWSTR const wide_name = (LPWSTR)_alloca( (num_wide_chars+1) * 2 );
-    int const res=::MultiByteToWideChar(CP_ACP, 0, name, -1, wide_name, num_wide_chars);
-    if(!res)
-        throw boost::thread_resource_error();
-    HANDLE mutex = CreateMutexW(0, 0, wide_name);
-#else
-    HANDLE mutex = CreateMutexA(0, 0, name);
-#endif
-    if (mutex == 0 || mutex == INVALID_HANDLE_VALUE) //:xxx (check for both values?)
-        throw boost::thread_resource_error();
-    return reinterpret_cast<void*>(mutex);
-}
-
-inline void delete_critical_section(void* mutex)
-{
-    DeleteCriticalSection(critical_section_cast(mutex));
-    delete critical_section_cast(mutex);
-}
-
-inline void delete_mutex(void* mutex)
-{
-    int res = 0;
-    res = CloseHandle(mutex_cast(mutex));
-    assert(res);
-}
-
-inline void wait_critical_section_infinite(void* mutex)
-{
-    EnterCriticalSection(critical_section_cast(mutex)); //:xxx Can throw an exception under low memory conditions
-}
-
-inline bool wait_critical_section_try(void* mutex)
-{
-    BOOL res = g_TryEnterCriticalSection(critical_section_cast(mutex));
-    return res != 0;
-}
-
-inline int wait_mutex(void* mutex, int time)
-{
-    unsigned int res = 0;
-    res = WaitForSingleObject(mutex_cast(mutex), time);
-//:xxx    assert(res != WAIT_FAILED && res != WAIT_ABANDONED);
-    return res;
-}
-
-inline void release_critical_section(void* mutex)
-{
-    LeaveCriticalSection(critical_section_cast(mutex));
-}
-
-inline void release_mutex(void* mutex)
-{
-    BOOL res = FALSE;
-    res = ReleaseMutex(mutex_cast(mutex));
-    assert(res);
-}
-#endif
-
-}
diff --git a/src/once.cpp b/src/once.cpp
deleted file mode 100644
index 0215995f..00000000
--- a/src/once.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
-// Copyright (C) 2007 Anthony Williams
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/thread/detail/config.hpp>
-#ifdef BOOST_HAS_MPTASKS
-
-#include <boost/detail/workaround.hpp>
-
-#include <boost/thread/once.hpp>
-#include <cstdio>
-#include <cassert>
-
-#include <Multiprocessing.h>
-
-namespace {
-void *remote_call_proxy(void *pData)
-{
-    std::pair<void (*)(), boost::once_flag *> &rData(
-        *reinterpret_cast<std::pair<void (*)(), boost::once_flag *> *>(pData));
-
-    if(*rData.second == false)
-    {
-        rData.first();
-        *rData.second = true;
-    }
-
-    return(NULL);
-}
-}
-
-namespace boost {
-
-    void call_once(once_flag& flag, void (*func)())
-{
-    if(flag == false)
-    {
-        // all we do here is make a remote call to blue, as blue is not
-        // reentrant.
-        std::pair<void (*)(), once_flag *> sData(func, &flag);
-        MPRemoteCall(remote_call_proxy, &sData, kMPOwningProcessRemoteContext);
-        assert(flag == true);
-    }
-}
-
-}
-#endif
diff --git a/src/recursive_mutex.cpp b/src/recursive_mutex.cpp
deleted file mode 100644
index ebe17c1a..00000000
--- a/src/recursive_mutex.cpp
+++ /dev/null
@@ -1,1040 +0,0 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
-//
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/thread/detail/config.hpp>
-
-#include <boost/thread/recursive_mutex.hpp>
-#include <boost/thread/xtime.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/limits.hpp>
-#include <string>
-#include <stdexcept>
-#include <cassert>
-#include "timeconv.inl"
-
-#if defined(BOOST_HAS_WINTHREADS)
-#   include <new>
-#   include <boost/thread/once.hpp>
-#   include <windows.h>
-#   include <time.h>
-#   include "mutex.inl"
-#elif defined(BOOST_HAS_PTHREADS)
-#   include <errno.h>
-#elif defined(BOOST_HAS_MPTASKS)
-#   include <MacErrors.h>
-#   include "safe.hpp"
-#endif
-
-namespace boost {
-
-#if defined(BOOST_HAS_WINTHREADS)
-
-recursive_mutex::recursive_mutex()
-    : m_mutex(0)
-    , m_critical_section(false)
-    , m_count(0)
-{
-    m_critical_section = true;
-    if (m_critical_section)
-        m_mutex = new_critical_section();
-    else
-        m_mutex = new_mutex(0);
-}
-
-recursive_mutex::~recursive_mutex()
-{
-    if (m_critical_section)
-        delete_critical_section(m_mutex);
-    else
-        delete_mutex(m_mutex);
-}
-
-void recursive_mutex::do_lock()
-{
-    if (m_critical_section)
-        wait_critical_section_infinite(m_mutex);
-    else
-        wait_mutex(m_mutex, INFINITE);
-
-    if (++m_count > 1)
-    {
-        if (m_critical_section)
-            release_critical_section(m_mutex);
-        else
-            release_mutex(m_mutex);
-    }
-}
-
-void recursive_mutex::do_unlock()
-{
-    if (--m_count == 0)
-    {
-        if (m_critical_section)
-            release_critical_section(m_mutex);
-        else
-            release_mutex(m_mutex);
-    }
-}
-
-void recursive_mutex::do_lock(cv_state& state)
-{
-    if (m_critical_section)
-        wait_critical_section_infinite(m_mutex);
-    else
-        wait_mutex(m_mutex, INFINITE);
-
-    m_count = state;
-}
-
-void recursive_mutex::do_unlock(cv_state& state)
-{
-    state = m_count;
-    m_count = 0;
-
-    if (m_critical_section)
-        release_critical_section(m_mutex);
-    else
-        release_mutex(m_mutex);
-}
-
-recursive_try_mutex::recursive_try_mutex()
-    : m_mutex(0)
-    , m_critical_section(false)
-    , m_count(0)
-{
-    m_critical_section = has_TryEnterCriticalSection();
-    if (m_critical_section)
-        m_mutex = new_critical_section();
-    else
-        m_mutex = new_mutex(0);
-}
-
-recursive_try_mutex::~recursive_try_mutex()
-{
-    if (m_critical_section)
-        delete_critical_section(m_mutex);
-    else
-        delete_mutex(m_mutex);
-}
-
-void recursive_try_mutex::do_lock()
-{
-    if (m_critical_section)
-        wait_critical_section_infinite(m_mutex);
-    else
-        wait_mutex(m_mutex, INFINITE);
-
-    if (++m_count > 1)
-    {
-        if (m_critical_section)
-            release_critical_section(m_mutex);
-        else
-            release_mutex(m_mutex);
-    }
-}
-
-bool recursive_try_mutex::do_trylock()
-{
-    bool res = false;
-    if (m_critical_section)
-        res = wait_critical_section_try(m_mutex);
-    else
-        res = wait_mutex(m_mutex, 0) == WAIT_OBJECT_0;
-
-    if (res)
-    {
-        if (++m_count > 1)
-        {
-            if (m_critical_section)
-                release_critical_section(m_mutex);
-            else
-                release_mutex(m_mutex);
-        }
-        return true;
-    }
-    return false;
-}
-
-void recursive_try_mutex::do_unlock()
-{
-    if (--m_count == 0)
-    {
-        if (m_critical_section)
-            release_critical_section(m_mutex);
-        else
-            release_mutex(m_mutex);
-    }
-}
-
-void recursive_try_mutex::do_lock(cv_state& state)
-{
-    if (m_critical_section)
-        wait_critical_section_infinite(m_mutex);
-    else
-        wait_mutex(m_mutex, INFINITE);
-
-    m_count = state;
-}
-
-void recursive_try_mutex::do_unlock(cv_state& state)
-{
-    state = m_count;
-    m_count = 0;
-
-    if (m_critical_section)
-        release_critical_section(m_mutex);
-    else
-        release_mutex(m_mutex);
-}
-
-recursive_timed_mutex::recursive_timed_mutex()
-    : m_mutex(0)
-    , m_count(0)
-{
-    m_mutex = new_mutex(0);
-}
-
-recursive_timed_mutex::~recursive_timed_mutex()
-{
-    delete_mutex(m_mutex);
-}
-
-void recursive_timed_mutex::do_lock()
-{
-    wait_mutex(m_mutex, INFINITE);
-
-    if (++m_count > 1)
-        release_mutex(m_mutex);
-}
-
-bool recursive_timed_mutex::do_trylock()
-{
-    bool res = wait_mutex(m_mutex, 0) == WAIT_OBJECT_0;
-
-    if (res)
-    {
-        if (++m_count > 1)
-            release_mutex(m_mutex);
-        return true;
-    }
-    return false;
-}
-
-bool recursive_timed_mutex::do_timedlock(const xtime& xt)
-{
-    for (;;)
-    {
-        int milliseconds;
-        to_duration(xt, milliseconds);
-
-        unsigned int res = wait_mutex(m_mutex, milliseconds);
-
-        if (res == WAIT_TIMEOUT)
-        {
-            xtime cur;
-            xtime_get(&cur, TIME_UTC);
-            if (xtime_cmp(xt, cur) > 0)
-                continue;
-        }
-
-        if (res == WAIT_OBJECT_0)
-        {
-            if (++m_count > 1)
-                release_mutex(m_mutex);
-            return true;
-        }
-
-        return false;
-    }
-}
-
-void recursive_timed_mutex::do_unlock()
-{
-    if (--m_count == 0)
-        release_mutex(m_mutex);
-}
-
-void recursive_timed_mutex::do_lock(cv_state& state)
-{
-    wait_mutex(m_mutex, INFINITE);
-
-    m_count = state;
-}
-
-void recursive_timed_mutex::do_unlock(cv_state& state)
-{
-    state = m_count;
-    m_count = 0;
-
-    release_mutex(m_mutex);
-}
-
-#elif defined(BOOST_HAS_PTHREADS)
-
-recursive_mutex::recursive_mutex()
-    : m_count(0)
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    , m_valid_id(false)
-#   endif
-{
-    pthread_mutexattr_t attr;
-    int res = pthread_mutexattr_init(&attr);
-    assert(res == 0);
-
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    res = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-    assert(res == 0);
-#   endif
-
-    res = pthread_mutex_init(&m_mutex, &attr);
-    {
-        int res = 0;
-        res = pthread_mutexattr_destroy(&attr);
-        assert(res == 0);
-    }
-    if (res != 0)
-        throw thread_resource_error();
-
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    res = pthread_cond_init(&m_unlocked, 0);
-    if (res != 0)
-    {
-        pthread_mutex_destroy(&m_mutex);
-        throw thread_resource_error();
-    }
-#   endif
-}
-
-recursive_mutex::~recursive_mutex()
-{
-    int res = 0;
-    res = pthread_mutex_destroy(&m_mutex);
-    assert(res == 0);
-
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    res = pthread_cond_destroy(&m_unlocked);
-    assert(res == 0);
-#   endif
-}
-
-void recursive_mutex::do_lock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    if (++m_count > 1)
-    {
-        res = pthread_mutex_unlock(&m_mutex);
-        assert(res == 0);
-    }
-#   else
-    pthread_t tid = pthread_self();
-    if (m_valid_id && pthread_equal(m_thread_id, tid))
-        ++m_count;
-    else
-    {
-        while (m_valid_id)
-        {
-            res = pthread_cond_wait(&m_unlocked, &m_mutex);
-            assert(res == 0);
-        }
-
-        m_thread_id = tid;
-        m_valid_id = true;
-        m_count = 1;
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-#   endif
-}
-
-void recursive_mutex::do_unlock()
-{
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    if (--m_count == 0)
-    {
-        int res = 0;
-        res = pthread_mutex_unlock(&m_mutex);
-        assert(res == 0);
-    }
-#   else
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    pthread_t tid = pthread_self();
-    if (m_valid_id && !pthread_equal(m_thread_id, tid))
-    {
-        res = pthread_mutex_unlock(&m_mutex);
-        assert(res == 0);
-        throw lock_error();
-    }
-
-    if (--m_count == 0)
-    {
-        assert(m_valid_id);
-        m_valid_id = false;
-
-        res = pthread_cond_signal(&m_unlocked);
-        assert(res == 0);
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-#   endif
-}
-
-void recursive_mutex::do_lock(cv_state& state)
-{
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    m_count = state.count;
-#   else
-    int res = 0;
-
-    while (m_valid_id)
-    {
-        res = pthread_cond_wait(&m_unlocked, &m_mutex);
-        assert(res == 0);
-    }
-
-    m_thread_id = pthread_self();
-    m_valid_id = true;
-    m_count = state.count;
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-#   endif
-}
-
-void recursive_mutex::do_unlock(cv_state& state)
-{
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    assert(m_valid_id);
-    m_valid_id = false;
-
-    res = pthread_cond_signal(&m_unlocked);
-    assert(res == 0);
-#   endif
-
-    state.pmutex = &m_mutex;
-    state.count = m_count;
-    m_count = 0;
-}
-
-recursive_try_mutex::recursive_try_mutex()
-    : m_count(0)
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    , m_valid_id(false)
-#   endif
-{
-    pthread_mutexattr_t attr;
-    int res = pthread_mutexattr_init(&attr);
-    assert(res == 0);
-
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    res = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-    assert(res == 0);
-#   endif
-
-    res = pthread_mutex_init(&m_mutex, &attr);
-    {
-        int res = 0;
-        res = pthread_mutexattr_destroy(&attr);
-        assert(res == 0);
-    }
-    if (res != 0)
-        throw thread_resource_error();
-
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    res = pthread_cond_init(&m_unlocked, 0);
-    if (res != 0)
-    {
-        pthread_mutex_destroy(&m_mutex);
-        throw thread_resource_error();
-    }
-#   endif
-}
-
-recursive_try_mutex::~recursive_try_mutex()
-{
-    int res = 0;
-    res = pthread_mutex_destroy(&m_mutex);
-    assert(res == 0);
-
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    res = pthread_cond_destroy(&m_unlocked);
-    assert(res == 0);
-#   endif
-}
-
-void recursive_try_mutex::do_lock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    if (++m_count > 1)
-    {
-        res = pthread_mutex_unlock(&m_mutex);
-        assert(res == 0);
-    }
-#   else
-    pthread_t tid = pthread_self();
-    if (m_valid_id && pthread_equal(m_thread_id, tid))
-        ++m_count;
-    else
-    {
-        while (m_valid_id)
-        {
-            res = pthread_cond_wait(&m_unlocked, &m_mutex);
-            assert(res == 0);
-        }
-
-        m_thread_id = tid;
-        m_valid_id = true;
-        m_count = 1;
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-#   endif
-}
-
-bool recursive_try_mutex::do_trylock()
-{
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    int res = 0;
-    res = pthread_mutex_trylock(&m_mutex);
-    assert(res == 0 || res == EBUSY);
-
-    if (res == 0)
-    {
-        if (++m_count > 1)
-        {
-            res = pthread_mutex_unlock(&m_mutex);
-            assert(res == 0);
-        }
-        return true;
-    }
-
-    return false;
-#   else
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    bool ret = false;
-    pthread_t tid = pthread_self();
-    if (m_valid_id && pthread_equal(m_thread_id, tid))
-    {
-        ++m_count;
-        ret = true;
-    }
-    else if (!m_valid_id)
-    {
-        m_thread_id = tid;
-        m_valid_id = true;
-        m_count = 1;
-        ret = true;
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-    return ret;
-#   endif
-}
-
-void recursive_try_mutex::do_unlock()
-{
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    if (--m_count == 0)
-    {
-        int res = 0;
-        res = pthread_mutex_unlock(&m_mutex);
-        assert(res == 0);
-    }
-#   else
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    pthread_t tid = pthread_self();
-    if (m_valid_id && !pthread_equal(m_thread_id, tid))
-    {
-        res = pthread_mutex_unlock(&m_mutex);
-        assert(res == 0);
-        throw lock_error();
-    }
-
-    if (--m_count == 0)
-    {
-        assert(m_valid_id);
-        m_valid_id = false;
-
-        res = pthread_cond_signal(&m_unlocked);
-        assert(res == 0);
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-#   endif
-}
-
-void recursive_try_mutex::do_lock(cv_state& state)
-{
-#   if defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    m_count = state.count;
-#   else
-    int res = 0;
-
-    while (m_valid_id)
-    {
-        res = pthread_cond_wait(&m_unlocked, &m_mutex);
-        assert(res == 0);
-    }
-
-    m_thread_id = pthread_self();
-    m_valid_id = true;
-    m_count = state.count;
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-#   endif
-}
-
-void recursive_try_mutex::do_unlock(cv_state& state)
-{
-#   if !defined(BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    assert(m_valid_id);
-    m_valid_id = false;
-
-    res = pthread_cond_signal(&m_unlocked);
-    assert(res == 0);
-#   endif
-
-    state.pmutex = &m_mutex;
-    state.count = m_count;
-    m_count = 0;
-}
-
-recursive_timed_mutex::recursive_timed_mutex()
-    : m_valid_id(false), m_count(0)
-{
-    int res = 0;
-    res = pthread_mutex_init(&m_mutex, 0);
-    if (res != 0)
-        throw thread_resource_error();
-
-    res = pthread_cond_init(&m_unlocked, 0);
-    if (res != 0)
-    {
-        pthread_mutex_destroy(&m_mutex);
-        throw thread_resource_error();
-    }
-}
-
-recursive_timed_mutex::~recursive_timed_mutex()
-{
-    int res = 0;
-    res = pthread_mutex_destroy(&m_mutex);
-    assert(res == 0);
-
-    res = pthread_cond_destroy(&m_unlocked);
-    assert(res == 0);
-}
-
-void recursive_timed_mutex::do_lock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    pthread_t tid = pthread_self();
-    if (m_valid_id && pthread_equal(m_thread_id, tid))
-        ++m_count;
-    else
-    {
-        while (m_valid_id)
-        {
-            res = pthread_cond_wait(&m_unlocked, &m_mutex);
-            assert(res == 0);
-        }
-
-        m_thread_id = tid;
-        m_valid_id = true;
-        m_count = 1;
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-}
-
-bool recursive_timed_mutex::do_trylock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    bool ret = false;
-    pthread_t tid = pthread_self();
-    if (m_valid_id && pthread_equal(m_thread_id, tid))
-    {
-        ++m_count;
-        ret = true;
-    }
-    else if (!m_valid_id)
-    {
-        m_thread_id = tid;
-        m_valid_id = true;
-        m_count = 1;
-        ret = true;
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-    return ret;
-}
-
-bool recursive_timed_mutex::do_timedlock(const xtime& xt)
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    bool ret = false;
-    pthread_t tid = pthread_self();
-    if (m_valid_id && pthread_equal(m_thread_id, tid))
-    {
-        ++m_count;
-        ret = true;
-    }
-    else
-    {
-        timespec ts;
-        to_timespec(xt, ts);
-
-        while (m_valid_id)
-        {
-            res = pthread_cond_timedwait(&m_unlocked, &m_mutex, &ts);
-            if (res == ETIMEDOUT)
-                break;
-            assert(res == 0);
-        }
-
-        if (!m_valid_id)
-        {
-            m_thread_id = tid;
-            m_valid_id = true;
-            m_count = 1;
-            ret = true;
-        }
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-    return ret;
-}
-
-void recursive_timed_mutex::do_unlock()
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    pthread_t tid = pthread_self();
-    if (m_valid_id && !pthread_equal(m_thread_id, tid))
-    {
-        res = pthread_mutex_unlock(&m_mutex);
-        assert(res == 0);
-        throw lock_error();
-    }
-
-    if (--m_count == 0)
-    {
-        assert(m_valid_id);
-        m_valid_id = false;
-
-        res = pthread_cond_signal(&m_unlocked);
-        assert(res == 0);
-    }
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-}
-
-void recursive_timed_mutex::do_lock(cv_state& state)
-{
-    int res = 0;
-
-    while (m_valid_id)
-    {
-        res = pthread_cond_wait(&m_unlocked, &m_mutex);
-        assert(res == 0);
-    }
-
-    m_thread_id = pthread_self();
-    m_valid_id = true;
-    m_count = state.count;
-
-    res = pthread_mutex_unlock(&m_mutex);
-    assert(res == 0);
-}
-
-void recursive_timed_mutex::do_unlock(cv_state& state)
-{
-    int res = 0;
-    res = pthread_mutex_lock(&m_mutex);
-    assert(res == 0);
-
-    assert(m_valid_id);
-    m_valid_id = false;
-
-    res = pthread_cond_signal(&m_unlocked);
-    assert(res == 0);
-
-    state.pmutex = &m_mutex;
-    state.count = m_count;
-    m_count = 0;
-}
-#elif defined(BOOST_HAS_MPTASKS)
-
-using threads::mac::detail::safe_enter_critical_region;
-
-
-recursive_mutex::recursive_mutex()
-    : m_count(0)
-{
-}
-
-recursive_mutex::~recursive_mutex()
-{
-}
-
-void recursive_mutex::do_lock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-
-    if (++m_count > 1)
-    {
-        lStatus = MPExitCriticalRegion(m_mutex);
-        assert(lStatus == noErr);
-    }
-}
-
-void recursive_mutex::do_unlock()
-{
-    if (--m_count == 0)
-    {
-        OSStatus lStatus = noErr;
-        lStatus = MPExitCriticalRegion(m_mutex);
-        assert(lStatus == noErr);
-    }
-}
-
-void recursive_mutex::do_lock(cv_state& state)
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-
-    m_count = state;
-}
-
-void recursive_mutex::do_unlock(cv_state& state)
-{
-    state = m_count;
-    m_count = 0;
-
-    OSStatus lStatus = noErr;
-    lStatus = MPExitCriticalRegion(m_mutex);
-    assert(lStatus == noErr);
-}
-
-recursive_try_mutex::recursive_try_mutex()
-    : m_count(0)
-{
-}
-
-recursive_try_mutex::~recursive_try_mutex()
-{
-}
-
-void recursive_try_mutex::do_lock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-
-    if (++m_count > 1)
-    {
-        lStatus = MPExitCriticalRegion(m_mutex);
-        assert(lStatus == noErr);
-    }
-}
-
-bool recursive_try_mutex::do_trylock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = MPEnterCriticalRegion(m_mutex, kDurationImmediate);
-    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
-
-    if (lStatus == noErr)
-    {
-        if (++m_count > 1)
-        {
-            lStatus = MPExitCriticalRegion(m_mutex);
-            assert(lStatus == noErr);
-        }
-        return true;
-    }
-    return false;
-}
-
-void recursive_try_mutex::do_unlock()
-{
-    if (--m_count == 0)
-    {
-        OSStatus lStatus = noErr;
-        lStatus = MPExitCriticalRegion(m_mutex);
-        assert(lStatus == noErr);
-    }
-}
-
-void recursive_try_mutex::do_lock(cv_state& state)
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-
-    m_count = state;
-}
-
-void recursive_try_mutex::do_unlock(cv_state& state)
-{
-    state = m_count;
-    m_count = 0;
-
-    OSStatus lStatus = noErr;
-    lStatus = MPExitCriticalRegion(m_mutex);
-    assert(lStatus == noErr);
-}
-
-recursive_timed_mutex::recursive_timed_mutex()
-    : m_count(0)
-{
-}
-
-recursive_timed_mutex::~recursive_timed_mutex()
-{
-}
-
-void recursive_timed_mutex::do_lock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-
-    if (++m_count > 1)
-    {
-        lStatus = MPExitCriticalRegion(m_mutex);
-        assert(lStatus == noErr);
-    }
-}
-
-bool recursive_timed_mutex::do_trylock()
-{
-    OSStatus lStatus = noErr;
-    lStatus = MPEnterCriticalRegion(m_mutex, kDurationImmediate);
-    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
-
-    if (lStatus == noErr)
-    {
-        if (++m_count > 1)
-        {
-            lStatus = MPExitCriticalRegion(m_mutex);
-            assert(lStatus == noErr);
-        }
-        return true;
-    }
-    return false;
-}
-
-bool recursive_timed_mutex::do_timedlock(const xtime& xt)
-{
-    int microseconds;
-    to_microduration(xt, microseconds);
-    Duration lDuration = kDurationMicrosecond * microseconds;
-
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, lDuration, m_mutex_mutex);
-    assert(lStatus == noErr || lStatus == kMPTimeoutErr);
-
-    if (lStatus == noErr)
-    {
-        if (++m_count > 1)
-        {
-            lStatus = MPExitCriticalRegion(m_mutex);
-            assert(lStatus == noErr);
-        }
-        return true;
-    }
-    return false;
-}
-
-void recursive_timed_mutex::do_unlock()
-{
-    if (--m_count == 0)
-    {
-        OSStatus lStatus = noErr;
-        lStatus = MPExitCriticalRegion(m_mutex);
-        assert(lStatus == noErr);
-    }
-}
-
-void recursive_timed_mutex::do_lock(cv_state& state)
-{
-    OSStatus lStatus = noErr;
-    lStatus = safe_enter_critical_region(m_mutex, kDurationForever,
-        m_mutex_mutex);
-    assert(lStatus == noErr);
-
-    m_count = state;
-}
-
-void recursive_timed_mutex::do_unlock(cv_state& state)
-{
-    state = m_count;
-    m_count = 0;
-
-    OSStatus lStatus = noErr;
-    lStatus = MPExitCriticalRegion(m_mutex);
-    assert(lStatus == noErr);
-}
-#endif
-
-} // namespace boost
-
-// Change Log:
-//   8 Feb 01  WEKEMPF Initial version.
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f3605d5b..209e6b07 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -40,6 +40,7 @@ rule thread-run ( sources )
           [ thread-run test_once.cpp ]
           [ thread-run test_xtime.cpp ]
           [ thread-run test_barrier.cpp ]		   
-#          [ thread-run test_read_write_mutex.cpp ]
+          [ thread-run test_shared_mutex.cpp ]
+          [ thread-run test_lock_concept.cpp ]
     ;
 }
diff --git a/test/test_lock_concept.cpp b/test/test_lock_concept.cpp
new file mode 100644
index 00000000..b0f5dc72
--- /dev/null
+++ b/test/test_lock_concept.cpp
@@ -0,0 +1,173 @@
+// (C) Copyright 2006-7 Anthony Williams
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+
+template<typename Mutex,typename Lock>
+struct test_initially_locked
+{
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m);
+        
+        BOOST_CHECK(lock);
+        BOOST_CHECK(lock.owns_lock());
+    }
+};
+
+template<typename Mutex,typename Lock>
+struct test_initially_unlocked_with_defer_lock_parameter
+{
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m,boost::defer_lock);
+        
+        BOOST_CHECK(!lock);
+        BOOST_CHECK(!lock.owns_lock());
+    }
+};
+
+template<typename Mutex,typename Lock>
+struct test_initially_locked_with_adopt_lock_parameter
+{
+    void operator()() const
+    {
+        Mutex m;
+        m.lock();
+        Lock lock(m,boost::adopt_lock);
+        
+        BOOST_CHECK(lock);
+        BOOST_CHECK(lock.owns_lock());
+    }
+};
+
+
+template<typename Mutex,typename Lock>
+struct test_unlocked_after_unlock_called
+{
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m);
+        lock.unlock();
+        BOOST_CHECK(!lock);
+        BOOST_CHECK(!lock.owns_lock());
+    }
+};
+
+template<typename Mutex,typename Lock>
+struct test_locked_after_lock_called
+{
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m,boost::defer_lock);
+        lock.lock();
+        BOOST_CHECK(lock);
+        BOOST_CHECK(lock.owns_lock());
+    }
+};
+
+template<typename Mutex,typename Lock>
+struct test_locked_after_try_lock_called
+{
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m,boost::defer_lock);
+        lock.try_lock();
+        BOOST_CHECK(lock);
+        BOOST_CHECK(lock.owns_lock());
+    }
+};
+
+template<typename Mutex,typename Lock>
+struct test_throws_if_lock_called_when_already_locked
+{
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m);
+        
+        BOOST_CHECK_THROW( lock.lock(), boost::lock_error );
+    }
+};
+
+template<typename Mutex,typename Lock>
+struct test_throws_if_try_lock_called_when_already_locked
+{
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m);
+        
+        BOOST_CHECK_THROW( lock.try_lock(), boost::lock_error );
+    }
+};
+
+template<typename Mutex,typename Lock>
+struct test_throws_if_unlock_called_when_already_unlocked
+{
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m);
+        lock.unlock();
+        
+        BOOST_CHECK_THROW( lock.unlock(), boost::lock_error );
+    }
+};
+
+BOOST_TEST_CASE_TEMPLATE_FUNCTION(test_scoped_lock_concept,Mutex)
+{
+    typedef typename Mutex::scoped_lock Lock;
+    
+    test_initially_locked<Mutex,Lock>()();
+    test_initially_unlocked_with_defer_lock_parameter<Mutex,Lock>()();
+    test_initially_locked_with_adopt_lock_parameter<Mutex,Lock>()();
+    test_unlocked_after_unlock_called<Mutex,Lock>()();
+    test_locked_after_lock_called<Mutex,Lock>()();
+    test_throws_if_lock_called_when_already_locked<Mutex,Lock>()();
+    test_throws_if_unlock_called_when_already_unlocked<Mutex,Lock>()();
+}
+
+BOOST_TEST_CASE_TEMPLATE_FUNCTION(test_scoped_try_lock_concept,Mutex)
+{
+    typedef typename Mutex::scoped_try_lock Lock;
+    
+    test_initially_locked<Mutex,Lock>()();
+    test_initially_unlocked_with_defer_lock_parameter<Mutex,Lock>()();
+    test_initially_locked_with_adopt_lock_parameter<Mutex,Lock>()();
+    test_unlocked_after_unlock_called<Mutex,Lock>()();
+    test_locked_after_lock_called<Mutex,Lock>()();
+    test_locked_after_try_lock_called<Mutex,Lock>()();
+    test_throws_if_lock_called_when_already_locked<Mutex,Lock>()();
+    test_throws_if_try_lock_called_when_already_locked<Mutex,Lock>()();
+    test_throws_if_unlock_called_when_already_unlocked<Mutex,Lock>()();
+}
+
+boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
+{
+    boost::unit_test_framework::test_suite* test =
+        BOOST_TEST_SUITE("Boost.Threads: lock concept test suite");
+
+    typedef boost::mpl::vector<boost::mutex,boost::try_mutex,boost::timed_mutex,
+        boost::recursive_mutex,boost::recursive_try_mutex,boost::recursive_timed_mutex> mutex_types;
+    
+    test->add(BOOST_TEST_CASE_TEMPLATE(test_scoped_lock_concept,mutex_types));
+
+    typedef boost::mpl::vector<boost::try_mutex,boost::timed_mutex,
+        boost::recursive_try_mutex,boost::recursive_timed_mutex> try_mutex_types;
+
+    test->add(BOOST_TEST_CASE_TEMPLATE(test_scoped_try_lock_concept,try_mutex_types));
+
+    return test;
+}
diff --git a/test/test_shared_mutex.cpp b/test/test_shared_mutex.cpp
new file mode 100644
index 00000000..763758d3
--- /dev/null
+++ b/test/test_shared_mutex.cpp
@@ -0,0 +1,460 @@
+// (C) Copyright 2006-7 Anthony Williams
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/test/unit_test.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/shared_mutex.hpp>
+#include <boost/thread/xtime.hpp>
+#include "util.inl"
+
+#define CHECK_LOCKED_VALUE_EQUAL(mutex_name,value,expected_value)    \
+    {                                                                \
+        boost::mutex::scoped_lock lock(mutex_name);                  \
+        BOOST_CHECK_EQUAL(value,expected_value);                     \
+    }
+
+
+namespace
+{
+    template<typename lock_type>
+    class locking_thread
+    {
+        boost::shared_mutex& rw_mutex;
+        unsigned& unblocked_count;
+        unsigned& simultaneous_running_count;
+        unsigned& max_simultaneous_running;
+        boost::mutex& unblocked_count_mutex;
+        boost::mutex& finish_mutex;
+    public:
+        locking_thread(boost::shared_mutex& rw_mutex_,
+                       unsigned& unblocked_count_,
+                       boost::mutex& unblocked_count_mutex_,
+                       boost::mutex& finish_mutex_,
+                       unsigned& simultaneous_running_count_,
+                       unsigned& max_simultaneous_running_):
+            rw_mutex(rw_mutex_),
+            unblocked_count(unblocked_count_),
+            unblocked_count_mutex(unblocked_count_mutex_),
+            finish_mutex(finish_mutex_),
+            simultaneous_running_count(simultaneous_running_count_),
+            max_simultaneous_running(max_simultaneous_running_)
+        {}
+        
+        void operator()()
+        {
+            // acquire lock
+            lock_type lock(rw_mutex);
+            
+            // increment count to show we're unblocked
+            {
+                boost::mutex::scoped_lock ublock(unblocked_count_mutex);
+                ++unblocked_count;
+                ++simultaneous_running_count;
+                if(simultaneous_running_count>max_simultaneous_running)
+                {
+                    max_simultaneous_running=simultaneous_running_count;
+                }
+            }
+            
+            // wait to finish
+            boost::mutex::scoped_lock finish_lock(finish_mutex);
+            {
+                boost::mutex::scoped_lock ublock(unblocked_count_mutex);
+                --simultaneous_running_count;
+            }
+        }
+    };
+    
+}
+
+
+void test_multiple_readers()
+{
+    unsigned const number_of_threads=100;
+    
+    boost::thread_group pool;
+
+    boost::shared_mutex rw_mutex;
+    unsigned unblocked_count=0;
+    unsigned simultaneous_running_count=0;
+    unsigned max_simultaneous_running=0;
+    boost::mutex unblocked_count_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+    
+    for(unsigned i=0;i<number_of_threads;++i)
+    {
+        pool.create_thread(locking_thread<boost::shared_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_mutex,simultaneous_running_count,max_simultaneous_running));
+    }
+
+    boost::thread::sleep(delay(1));
+
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,number_of_threads);
+
+    finish_lock.unlock();
+
+    pool.join_all();
+
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,max_simultaneous_running,number_of_threads);
+}
+
+void test_only_one_writer_permitted()
+{
+    unsigned const number_of_threads=100;
+    
+    boost::thread_group pool;
+
+    boost::shared_mutex rw_mutex;
+    unsigned unblocked_count=0;
+    unsigned simultaneous_running_count=0;
+    unsigned max_simultaneous_running=0;
+    boost::mutex unblocked_count_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+    
+    for(unsigned i=0;i<number_of_threads;++i)
+    {
+        pool.create_thread(locking_thread<boost::unique_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_mutex,simultaneous_running_count,max_simultaneous_running));
+    }
+
+    boost::thread::sleep(delay(1));
+
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,1U);
+
+    finish_lock.unlock();
+
+    pool.join_all();
+
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,number_of_threads);
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,max_simultaneous_running,1);
+}
+
+void test_reader_blocks_writer()
+{
+    boost::thread_group pool;
+
+    boost::shared_mutex rw_mutex;
+    unsigned unblocked_count=0;
+    unsigned simultaneous_running_count=0;
+    unsigned max_simultaneous_running=0;
+    boost::mutex unblocked_count_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+    
+    pool.create_thread(locking_thread<boost::shared_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_mutex,simultaneous_running_count,max_simultaneous_running));
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,1U);
+    pool.create_thread(locking_thread<boost::unique_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_mutex,simultaneous_running_count,max_simultaneous_running));
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,1U);
+
+    finish_lock.unlock();
+
+    pool.join_all();
+
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,2U);
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,max_simultaneous_running,1);
+}
+
+void test_unlocking_writer_unblocks_all_readers()
+{
+    boost::thread_group pool;
+
+    boost::shared_mutex rw_mutex;
+    boost::unique_lock<boost::shared_mutex>  write_lock(rw_mutex);
+    unsigned unblocked_count=0;
+    unsigned simultaneous_running_count=0;
+    unsigned max_simultaneous_running=0;
+    boost::mutex unblocked_count_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+
+    unsigned const reader_count=100;
+
+    for(unsigned i=0;i<reader_count;++i)
+    {
+        pool.create_thread(locking_thread<boost::shared_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_mutex,simultaneous_running_count,max_simultaneous_running));
+    }
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,0U);
+
+    write_lock.unlock();
+    
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,reader_count);
+
+    finish_lock.unlock();
+    pool.join_all();
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,max_simultaneous_running,reader_count);
+}
+
+void test_unlocking_last_reader_only_unblocks_one_writer()
+{
+    boost::thread_group pool;
+
+    boost::shared_mutex rw_mutex;
+    unsigned unblocked_count=0;
+    unsigned simultaneous_running_readers=0;
+    unsigned max_simultaneous_readers=0;
+    unsigned simultaneous_running_writers=0;
+    unsigned max_simultaneous_writers=0;
+    boost::mutex unblocked_count_mutex;
+    boost::mutex finish_reading_mutex;
+    boost::mutex::scoped_lock finish_reading_lock(finish_reading_mutex);
+    boost::mutex finish_writing_mutex;
+    boost::mutex::scoped_lock finish_writing_lock(finish_writing_mutex);
+
+    unsigned const reader_count=100;
+    unsigned const writer_count=100;
+
+    for(unsigned i=0;i<reader_count;++i)
+    {
+        pool.create_thread(locking_thread<boost::shared_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_reading_mutex,simultaneous_running_readers,max_simultaneous_readers));
+    }
+    for(unsigned i=0;i<writer_count;++i)
+    {
+        pool.create_thread(locking_thread<boost::unique_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_writing_mutex,simultaneous_running_writers,max_simultaneous_writers));
+    }
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,reader_count);
+
+    finish_reading_lock.unlock();
+
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,reader_count+1);
+
+    finish_writing_lock.unlock();
+    pool.join_all();
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,reader_count+writer_count);
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,max_simultaneous_readers,reader_count);
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,max_simultaneous_writers,1);
+}
+
+void test_only_one_upgrade_lock_permitted()
+{
+    unsigned const number_of_threads=100;
+    
+    boost::thread_group pool;
+
+    boost::shared_mutex rw_mutex;
+    unsigned unblocked_count=0;
+    unsigned simultaneous_running_count=0;
+    unsigned max_simultaneous_running=0;
+    boost::mutex unblocked_count_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+    
+    for(unsigned i=0;i<number_of_threads;++i)
+    {
+        pool.create_thread(locking_thread<boost::upgrade_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_mutex,simultaneous_running_count,max_simultaneous_running));
+    }
+
+    boost::thread::sleep(delay(1));
+
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,1U);
+
+    finish_lock.unlock();
+
+    pool.join_all();
+
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,number_of_threads);
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,max_simultaneous_running,1);
+}
+
+void test_can_lock_upgrade_if_currently_locked_shared()
+{
+    boost::thread_group pool;
+
+    boost::shared_mutex rw_mutex;
+    unsigned unblocked_count=0;
+    unsigned simultaneous_running_count=0;
+    unsigned max_simultaneous_running=0;
+    boost::mutex unblocked_count_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+
+    unsigned const reader_count=100;
+
+    for(unsigned i=0;i<reader_count;++i)
+    {
+        pool.create_thread(locking_thread<boost::shared_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_mutex,simultaneous_running_count,max_simultaneous_running));
+    }
+    pool.create_thread(locking_thread<boost::upgrade_lock<boost::shared_mutex> >(rw_mutex,unblocked_count,unblocked_count_mutex,finish_mutex,simultaneous_running_count,max_simultaneous_running));
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,reader_count+1);
+
+    finish_lock.unlock();
+    pool.join_all();
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,unblocked_count,reader_count+1);
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_count_mutex,max_simultaneous_running,reader_count+1);
+}
+
+namespace
+{
+    class simple_writing_thread
+    {
+        boost::shared_mutex& rwm;
+        boost::mutex& finish_mutex;
+        boost::mutex& unblocked_mutex;
+        unsigned& unblocked_count;
+        
+    public:
+        simple_writing_thread(boost::shared_mutex& rwm_,
+                              boost::mutex& finish_mutex_,
+                              boost::mutex& unblocked_mutex_,
+                              unsigned& unblocked_count_):
+            rwm(rwm_),finish_mutex(finish_mutex_),
+            unblocked_mutex(unblocked_mutex_),unblocked_count(unblocked_count_)
+        {}
+        
+        void operator()()
+        {
+            boost::unique_lock<boost::shared_mutex>  lk(rwm);
+            
+            {
+                boost::mutex::scoped_lock ulk(unblocked_mutex);
+                ++unblocked_count;
+            }
+            
+            boost::mutex::scoped_lock flk(finish_mutex);
+        }
+    };
+}
+
+void test_if_other_thread_has_write_lock_try_lock_shared_returns_false()
+{
+
+    boost::shared_mutex rw_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex unblocked_mutex;
+    unsigned unblocked_count=0;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+    boost::thread writer(simple_writing_thread(rw_mutex,finish_mutex,unblocked_mutex,unblocked_count));
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_mutex,unblocked_count,1);
+
+    bool const try_succeeded=rw_mutex.try_lock_shared();
+    BOOST_CHECK(!try_succeeded);
+    if(try_succeeded)
+    {
+        rw_mutex.unlock_shared();
+    }
+
+    finish_lock.unlock();
+    writer.join();
+}
+
+void test_if_no_thread_has_lock_try_lock_shared_returns_true()
+{
+    boost::shared_mutex rw_mutex;
+    bool const try_succeeded=rw_mutex.try_lock_shared();
+    BOOST_CHECK(try_succeeded);
+    if(try_succeeded)
+    {
+        rw_mutex.unlock_shared();
+    }
+}
+
+namespace
+{
+    class simple_reading_thread
+    {
+        boost::shared_mutex& rwm;
+        boost::mutex& finish_mutex;
+        boost::mutex& unblocked_mutex;
+        unsigned& unblocked_count;
+        
+    public:
+        simple_reading_thread(boost::shared_mutex& rwm_,
+                              boost::mutex& finish_mutex_,
+                              boost::mutex& unblocked_mutex_,
+                              unsigned& unblocked_count_):
+            rwm(rwm_),finish_mutex(finish_mutex_),
+            unblocked_mutex(unblocked_mutex_),unblocked_count(unblocked_count_)
+        {}
+        
+        void operator()()
+        {
+            boost::shared_lock<boost::shared_mutex>  lk(rwm);
+            
+            {
+                boost::mutex::scoped_lock ulk(unblocked_mutex);
+                ++unblocked_count;
+            }
+            
+            boost::mutex::scoped_lock flk(finish_mutex);
+        }
+    };
+}
+
+void test_if_other_thread_has_shared_lock_try_lock_shared_returns_true()
+{
+
+    boost::shared_mutex rw_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex unblocked_mutex;
+    unsigned unblocked_count=0;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+    boost::thread writer(simple_reading_thread(rw_mutex,finish_mutex,unblocked_mutex,unblocked_count));
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_mutex,unblocked_count,1);
+
+    bool const try_succeeded=rw_mutex.try_lock_shared();
+    BOOST_CHECK(try_succeeded);
+    if(try_succeeded)
+    {
+        rw_mutex.unlock_shared();
+    }
+
+    finish_lock.unlock();
+    writer.join();
+}
+
+void test_timed_lock_shared_times_out_if_write_lock_held()
+{
+    boost::shared_mutex rw_mutex;
+    boost::mutex finish_mutex;
+    boost::mutex unblocked_mutex;
+    unsigned unblocked_count=0;
+    boost::mutex::scoped_lock finish_lock(finish_mutex);
+    boost::thread writer(simple_writing_thread(rw_mutex,finish_mutex,unblocked_mutex,unblocked_count));
+    boost::thread::sleep(delay(1));
+    CHECK_LOCKED_VALUE_EQUAL(unblocked_mutex,unblocked_count,1);
+
+    boost::system_time const start=boost::get_system_time();
+    boost::system_time const timeout=start+boost::posix_time::milliseconds(100);
+    bool const timed_lock_succeeded=rw_mutex.timed_lock_shared(timeout);
+    BOOST_CHECK(timeout<=boost::get_system_time());
+    BOOST_CHECK(!timed_lock_succeeded);
+    if(timed_lock_succeeded)
+    {
+        rw_mutex.unlock_shared();
+    }
+
+    finish_lock.unlock();
+    writer.join();
+}
+
+
+boost::unit_test_framework::test_suite* init_unit_test_suite(int, char*[])
+{
+    boost::unit_test_framework::test_suite* test =
+        BOOST_TEST_SUITE("Boost.Threads: shared_mutex test suite");
+
+    test->add(BOOST_TEST_CASE(&test_multiple_readers));
+    test->add(BOOST_TEST_CASE(&test_only_one_writer_permitted));
+    test->add(BOOST_TEST_CASE(&test_reader_blocks_writer));
+    test->add(BOOST_TEST_CASE(&test_unlocking_writer_unblocks_all_readers));
+    test->add(BOOST_TEST_CASE(&test_unlocking_last_reader_only_unblocks_one_writer));
+    test->add(BOOST_TEST_CASE(&test_only_one_upgrade_lock_permitted));
+    test->add(BOOST_TEST_CASE(&test_can_lock_upgrade_if_currently_locked_shared));
+    test->add(BOOST_TEST_CASE(&test_if_other_thread_has_write_lock_try_lock_shared_returns_false));
+    test->add(BOOST_TEST_CASE(&test_if_no_thread_has_lock_try_lock_shared_returns_true));
+    test->add(BOOST_TEST_CASE(&test_if_other_thread_has_shared_lock_try_lock_shared_returns_true));
+    test->add(BOOST_TEST_CASE(&test_timed_lock_shared_times_out_if_write_lock_held));
+
+    return test;
+}