forked from boostorg/smart_ptr
Merge revision 82971 from trunk:
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:
@ -33,10 +33,10 @@ namespace boost {
|
||||
struct rebind {
|
||||
typedef allocate_array_helper<A, T[], U> 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<class U>
|
||||
allocate_array_helper(const allocate_array_helper<A, T[], U>& other)
|
||||
@ -107,9 +107,9 @@ namespace boost {
|
||||
struct rebind {
|
||||
typedef allocate_array_helper<A, T[N], U> 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<class U>
|
||||
allocate_array_helper(const allocate_array_helper<A, T[N], U>& other)
|
||||
|
@ -19,8 +19,8 @@ namespace boost {
|
||||
template<typename T>
|
||||
class array_deleter<T[]> {
|
||||
public:
|
||||
array_deleter(std::size_t size)
|
||||
: size(size),
|
||||
array_deleter(std::size_t size_)
|
||||
: size(size_),
|
||||
object(0) {
|
||||
}
|
||||
~array_deleter() {
|
||||
|
@ -31,9 +31,9 @@ namespace boost {
|
||||
struct rebind {
|
||||
typedef make_array_helper<T[], U> 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<class U>
|
||||
make_array_helper(const make_array_helper<T[], U>& other)
|
||||
@ -72,7 +72,7 @@ namespace boost {
|
||||
memory->~Y();
|
||||
}
|
||||
template<typename U>
|
||||
bool operator==(const make_array_helper<T[], U>& other) const {
|
||||
bool operator==(const make_array_helper<T[], U>&) const {
|
||||
return true;
|
||||
}
|
||||
template<typename U>
|
||||
@ -99,8 +99,8 @@ namespace boost {
|
||||
struct rebind {
|
||||
typedef make_array_helper<T[N], U> other;
|
||||
};
|
||||
make_array_helper(T** data)
|
||||
: data(data) {
|
||||
make_array_helper(T** data_)
|
||||
: data(data_) {
|
||||
}
|
||||
template<class U>
|
||||
make_array_helper(const make_array_helper<T[N], U>& other)
|
||||
@ -138,7 +138,7 @@ namespace boost {
|
||||
memory->~Y();
|
||||
}
|
||||
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;
|
||||
}
|
||||
template<typename U>
|
||||
|
Reference in New Issue
Block a user