From cb771a7783c486572ccfe79b49044db92d979056 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 14 Jun 2019 16:39:51 +0100 Subject: [PATCH] Fix names of _Lock_policy constants in libstdc++ manual Backport from mainline 2019-05-21 Jonathan Wakely * doc/xml/manual/shared_ptr.xml: Fix names of lock policy constants. From-SVN: r272292 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/doc/xml/manual/shared_ptr.xml | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9caebc460a05..d121eef51fd8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2019-06-14 Jonathan Wakely + + Backport from mainline + 2019-05-21 Jonathan Wakely + + * doc/xml/manual/shared_ptr.xml: Fix names of lock policy constants. + 2019-06-11 Edward Smith-Rowland <3dw4rd@verizon.net> Fix ConstexprIterator requirements tests - No constexpr algorithms! diff --git a/libstdc++-v3/doc/xml/manual/shared_ptr.xml b/libstdc++-v3/doc/xml/manual/shared_ptr.xml index fcbade6d5bfd..24e275e95ebb 100644 --- a/libstdc++-v3/doc/xml/manual/shared_ptr.xml +++ b/libstdc++-v3/doc/xml/manual/shared_ptr.xml @@ -239,7 +239,7 @@ available policies are: - _S_Atomic + _S_atomic Selected when GCC supports a builtin atomic compare-and-swap operation @@ -252,7 +252,7 @@ synchronisation. - _S_Mutex + _S_mutex The _Sp_counted_base specialization for this policy contains a mutex, @@ -263,7 +263,7 @@ builtins aren't available so explicit memory barriers are needed in places. - _S_Single + _S_single This policy uses a non-reentrant add_ref_lock() with no locking. It is -- 2.47.2