From 4476df2b764e3662326bdb2458d8928deca83456 Mon Sep 17 00:00:00 2001 From: Franz Detro Date: Mon, 11 Feb 2013 12:35:23 +0100 Subject: [PATCH] fix warnings in boost smart_ptr --- boost/smart_ptr/detail/allocate_array_helper.hpp | 14 +++++++------- boost/smart_ptr/detail/array_deleter.hpp | 4 ++-- boost/smart_ptr/detail/make_array_helper.hpp | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/boost/smart_ptr/detail/allocate_array_helper.hpp b/boost/smart_ptr/detail/allocate_array_helper.hpp index f7c64fe..2eeea2d 100644 --- a/boost/smart_ptr/detail/allocate_array_helper.hpp +++ b/boost/smart_ptr/detail/allocate_array_helper.hpp @@ -33,10 +33,10 @@ namespace boost { struct rebind { typedef allocate_array_helper other; }; - allocate_array_helper(const A& allocator, std::size_t size, T** data) - : allocator(allocator), - size(sizeof(T) * size), - data(data) { + allocate_array_helper(const A& allocator_, std::size_t size_, T** data_) + : allocator(allocator_), + size(sizeof(T) * size_), + data(data_) { } template allocate_array_helper(const allocate_array_helper& other) @@ -107,9 +107,9 @@ namespace boost { struct rebind { typedef allocate_array_helper other; }; - allocate_array_helper(const A& allocator, T** data) - : allocator(allocator), - data(data) { + allocate_array_helper(const A& allocator_, T** data_) + : allocator(allocator_), + data(data_) { } template allocate_array_helper(const allocate_array_helper& other) diff --git a/boost/smart_ptr/detail/array_deleter.hpp b/boost/smart_ptr/detail/array_deleter.hpp index 11f23fa..20f84d1 100644 --- a/boost/smart_ptr/detail/array_deleter.hpp +++ b/boost/smart_ptr/detail/array_deleter.hpp @@ -19,8 +19,8 @@ namespace boost { template class array_deleter { public: - array_deleter(std::size_t size) - : size(size), + array_deleter(std::size_t size_) + : size(size_), object(0) { } ~array_deleter() { diff --git a/boost/smart_ptr/detail/make_array_helper.hpp b/boost/smart_ptr/detail/make_array_helper.hpp index 38c9dc9..cf6598a 100644 --- a/boost/smart_ptr/detail/make_array_helper.hpp +++ b/boost/smart_ptr/detail/make_array_helper.hpp @@ -31,9 +31,9 @@ namespace boost { struct rebind { typedef make_array_helper other; }; - make_array_helper(std::size_t size, T** data) - : size(sizeof(T) * size), - data(data) { + make_array_helper(std::size_t size_, T** data_) + : size(sizeof(T) * size_), + data(data_) { } template make_array_helper(const make_array_helper& other) @@ -72,7 +72,7 @@ namespace boost { memory->~Y(); } template - bool operator==(const make_array_helper& other) const { + bool operator==(const make_array_helper& /*other*/) const { return true; } template @@ -99,8 +99,8 @@ namespace boost { struct rebind { typedef make_array_helper other; }; - make_array_helper(T** data) - : data(data) { + make_array_helper(T** data_) + : data(data_) { } template make_array_helper(const make_array_helper& other) @@ -138,7 +138,7 @@ namespace boost { memory->~Y(); } template - bool operator==(const make_array_helper& other) const { + bool operator==(const make_array_helper& /*other*/) const { return true; } template -- 1.7.11.1