From 5dfcd2a6e4408d249cfbed44886f3a01e3976073 Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glen.fernandes@gmail.com>
Date: Mon, 27 Nov 2017 23:47:13 -0500
Subject: [PATCH 1/2] Rename parameters to cope with gcc 4.8 -Wshadow

---
 include/boost/smart_ptr/allocate_shared_array.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/boost/smart_ptr/allocate_shared_array.hpp b/include/boost/smart_ptr/allocate_shared_array.hpp
index 53023e7..3406881 100644
--- a/include/boost/smart_ptr/allocate_shared_array.hpp
+++ b/include/boost/smart_ptr/allocate_shared_array.hpp
@@ -353,9 +353,9 @@ public:
     typedef A type;
 
     template<class U>
-    sp_array_state(const U& allocator, std::size_t size) BOOST_SP_NOEXCEPT
-        : allocator_(allocator),
-          size_(size) { }
+    sp_array_state(const U& _allocator, std::size_t _size) BOOST_SP_NOEXCEPT
+        : allocator_(_allocator),
+          size_(_size) { }
 
     A& allocator() BOOST_SP_NOEXCEPT {
         return allocator_;
@@ -376,8 +376,8 @@ public:
     typedef A type;
 
     template<class U>
-    sp_size_array_state(const U& allocator, std::size_t) BOOST_SP_NOEXCEPT
-        : allocator_(allocator) { }
+    sp_size_array_state(const U& _allocator, std::size_t) BOOST_SP_NOEXCEPT
+        : allocator_(_allocator) { }
 
     A& allocator() BOOST_SP_NOEXCEPT {
         return allocator_;

From 2553a71b7922f3f8dff6472498459005c90e567c Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Tue, 28 Nov 2017 20:09:52 +0200
Subject: [PATCH 2/2] Fix intrusive_ptr converting constructor doc issue #46

---
 doc/smart_ptr/intrusive_ptr.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/smart_ptr/intrusive_ptr.adoc b/doc/smart_ptr/intrusive_ptr.adoc
index 1c729cd..daf6794 100644
--- a/doc/smart_ptr/intrusive_ptr.adoc
+++ b/doc/smart_ptr/intrusive_ptr.adoc
@@ -155,7 +155,7 @@ template<class Y> intrusive_ptr(intrusive_ptr<Y> const & r);
 [none]
 * {blank}
 +
-Effects:: `if(r.get() != 0) intrusive_ptr_add_ref(r.get());`.
+Effects:: `T * p = r.get(); if(p != 0) intrusive_ptr_add_ref(p);`.
 Postconditions:: `get() == r.get()`.
 
 ### destructor