From 4476df2b764e3662326bdb2458d8928deca83456 Mon Sep 17 00:00:00 2001
From: Franz Detro <franz.detro@native-instruments.de>
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
|
b
|
namespace boost {
|
33 | 33 | struct rebind { |
34 | 34 | typedef allocate_array_helper<A, T[], U> other; |
35 | 35 | }; |
36 | | allocate_array_helper(const A& allocator, std::size_t size, T** data) |
37 | | : allocator(allocator), |
38 | | size(sizeof(T) * size), |
39 | | data(data) { |
| 36 | allocate_array_helper(const A& allocator_, std::size_t size_, T** data_) |
| 37 | : allocator(allocator_), |
| 38 | size(sizeof(T) * size_), |
| 39 | data(data_) { |
40 | 40 | } |
41 | 41 | template<class U> |
42 | 42 | allocate_array_helper(const allocate_array_helper<A, T[], U>& other) |
… |
… |
namespace boost {
|
107 | 107 | struct rebind { |
108 | 108 | typedef allocate_array_helper<A, T[N], U> other; |
109 | 109 | }; |
110 | | allocate_array_helper(const A& allocator, T** data) |
111 | | : allocator(allocator), |
112 | | data(data) { |
| 110 | allocate_array_helper(const A& allocator_, T** data_) |
| 111 | : allocator(allocator_), |
| 112 | data(data_) { |
113 | 113 | } |
114 | 114 | template<class U> |
115 | 115 | allocate_array_helper(const allocate_array_helper<A, T[N], U>& other) |
diff --git a/boost/smart_ptr/detail/array_deleter.hpp b/boost/smart_ptr/detail/array_deleter.hpp
index 11f23fa..20f84d1 100644
a
|
b
|
namespace boost {
|
19 | 19 | template<typename T> |
20 | 20 | class array_deleter<T[]> { |
21 | 21 | public: |
22 | | array_deleter(std::size_t size) |
23 | | : size(size), |
| 22 | array_deleter(std::size_t size_) |
| 23 | : size(size_), |
24 | 24 | object(0) { |
25 | 25 | } |
26 | 26 | ~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
|
b
|
namespace boost {
|
31 | 31 | struct rebind { |
32 | 32 | typedef make_array_helper<T[], U> other; |
33 | 33 | }; |
34 | | make_array_helper(std::size_t size, T** data) |
35 | | : size(sizeof(T) * size), |
36 | | data(data) { |
| 34 | make_array_helper(std::size_t size_, T** data_) |
| 35 | : size(sizeof(T) * size_), |
| 36 | data(data_) { |
37 | 37 | } |
38 | 38 | template<class U> |
39 | 39 | make_array_helper(const make_array_helper<T[], U>& other) |
… |
… |
namespace boost {
|
72 | 72 | memory->~Y(); |
73 | 73 | } |
74 | 74 | template<typename U> |
75 | | bool operator==(const make_array_helper<T[], U>& other) const { |
| 75 | bool operator==(const make_array_helper<T[], U>& /*other*/) const { |
76 | 76 | return true; |
77 | 77 | } |
78 | 78 | template<typename U> |
… |
… |
namespace boost {
|
99 | 99 | struct rebind { |
100 | 100 | typedef make_array_helper<T[N], U> other; |
101 | 101 | }; |
102 | | make_array_helper(T** data) |
103 | | : data(data) { |
| 102 | make_array_helper(T** data_) |
| 103 | : data(data_) { |
104 | 104 | } |
105 | 105 | template<class U> |
106 | 106 | make_array_helper(const make_array_helper<T[N], U>& other) |
… |
… |
namespace boost {
|
138 | 138 | memory->~Y(); |
139 | 139 | } |
140 | 140 | template<typename U> |
141 | | bool operator==(const make_array_helper<T[N], U>& other) const { |
| 141 | bool operator==(const make_array_helper<T[N], U>& /*other*/) const { |
142 | 142 | return true; |
143 | 143 | } |
144 | 144 | template<typename U> |