update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / smart_ptr / allocate_shared_array.hpp

diff --git a/ceph/src/boost/boost/smart_ptr/allocate_shared_array.hpp b/ceph/src/boost/boost/smart_ptr/allocate_shared_array.hpp
index 53023e71820fd25fceb7ef38db2f7f25ff223e8c..340688146ca43d00537912f8c32c33eb966a1f13 100644 (file)
--- a/ceph/src/boost/boost/smart_ptr/allocate_shared_array.hpp
+++ b/ceph/src/boost/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_;