Compare commits

...

2 Commits

Author SHA1 Message Date
Marshall Clow
ccb1f93113 Release 1.54.0
[SVN r84923]
2013-07-01 16:53:14 +00:00
Marshall Clow
6998f28fda Apply patch to release branch; Fixes #8032
[SVN r84450]
2013-05-23 18:45:31 +00:00
2 changed files with 3 additions and 3 deletions

View File

@@ -2316,7 +2316,7 @@ private:
}
//! Specialized method for swapping the allocator.
void swap_allocator(circular_buffer<T, Alloc>& cb, const true_type&) {
void swap_allocator(circular_buffer<T, Alloc>&, const true_type&) {
// Swap is not needed because allocators have no state.
}

View File

@@ -1300,7 +1300,7 @@ private:
//! Specialized method for determining the initial capacity.
template <class IntegralType>
static size_type init_capacity(const capacity_type& capacity_ctrl, IntegralType n, IntegralType item,
static size_type init_capacity(const capacity_type& capacity_ctrl, IntegralType n, IntegralType,
const true_type&) {
return init_capacity(capacity_ctrl, static_cast<size_type>(n));
}
@@ -1320,7 +1320,7 @@ private:
//! Specialized method for determining the initial capacity.
template <class InputIterator>
static size_type init_capacity(const capacity_type& capacity_ctrl, InputIterator first, InputIterator last,
static size_type init_capacity(const capacity_type& capacity_ctrl, InputIterator, InputIterator,
const std::input_iterator_tag&) {
return capacity_ctrl.capacity();
}