feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Merge revision 82971 from trunk:

Browse Source 
Identifier renaming in allocate_array_helper, array_deleter, make_array_helper
function parameters to satisfy higher warning levels.
........


[SVN r82976]
This commit is contained in:
Glen Fernandes
2013-02-18 18:04:48 +00:00
parent e39fcad839
commit 3178d38137
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/smart_ptr/detail/allocate_array_helper.hpp
View File

@ -33,10 +33,10 @@ namespace boost {
struct rebind { struct rebind {
typedef allocate_array_helper<A, T[], U> other; typedef allocate_array_helper<A, T[], U> other;
}; };
allocate_array_helper(const A& allocator, std::size_t size, T** data) allocate_array_helper(const A& allocator_, std::size_t size_, T** data_)
: allocator(allocator), : allocator(allocator_),
size(sizeof(T) * size), size(sizeof(T) * size_),
data(data) { data(data_) {
} }
template<class U> template<class U>
allocate_array_helper(const allocate_array_helper<A, T[], U>& other) allocate_array_helper(const allocate_array_helper<A, T[], U>& other)
@ -107,9 +107,9 @@ namespace boost {
struct rebind { struct rebind {
typedef allocate_array_helper<A, T[N], U> other; typedef allocate_array_helper<A, T[N], U> other;
}; };
allocate_array_helper(const A& allocator, T** data) allocate_array_helper(const A& allocator_, T** data_)
: allocator(allocator), : allocator(allocator_),
data(data) { data(data_) {
} }
template<class U> template<class U>
allocate_array_helper(const allocate_array_helper<A, T[N], U>& other) allocate_array_helper(const allocate_array_helper<A, T[N], U>& other)

4
include/boost/smart_ptr/detail/array_deleter.hpp
View File

@ -19,8 +19,8 @@ namespace boost {
template<typename T> template<typename T>
class array_deleter<T[]> { class array_deleter<T[]> {
public: public:
array_deleter(std::size_t size) array_deleter(std::size_t size_)
: size(size), : size(size_),
object(0) { object(0) {
} }
~array_deleter() { ~array_deleter() {

14
include/boost/smart_ptr/detail/make_array_helper.hpp
View File

@ -31,9 +31,9 @@ namespace boost {
struct rebind { struct rebind {
typedef make_array_helper<T[], U> other; typedef make_array_helper<T[], U> other;
}; };
make_array_helper(std::size_t size, T** data) make_array_helper(std::size_t size_, T** data_)
: size(sizeof(T) * size), : size(sizeof(T) * size_),
data(data) { data(data_) {
} }
template<class U> template<class U>
make_array_helper(const make_array_helper<T[], U>& other) make_array_helper(const make_array_helper<T[], U>& other)
@ -72,7 +72,7 @@ namespace boost {
memory->~Y(); memory->~Y();
} }
template<typename U> template<typename U>
bool operator==(const make_array_helper<T[], U>& other) const { bool operator==(const make_array_helper<T[], U>&) const {
return true; return true;
} }
template<typename U> template<typename U>
@ -99,8 +99,8 @@ namespace boost {
struct rebind { struct rebind {
typedef make_array_helper<T[N], U> other; typedef make_array_helper<T[N], U> other;
}; };
make_array_helper(T** data) make_array_helper(T** data_)
: data(data) { : data(data_) {
} }
template<class U> template<class U>
make_array_helper(const make_array_helper<T[N], U>& other) make_array_helper(const make_array_helper<T[N], U>& other)
@ -138,7 +138,7 @@ namespace boost {
memory->~Y(); memory->~Y();
} }
template<typename U> template<typename U>
bool operator==(const make_array_helper<T[N], U>& other) const { bool operator==(const make_array_helper<T[N], U>&) const {
return true; return true;
} }
template<typename U> template<typename U>