Removed tabs.

This commit is contained in:
Ion Gaztañaga committed 2016-03-23 22:11:25 +01:00
1 parent cae8d2dda3
commit 122916d820
8 files changed
+34 -42

No files matched your search

+2 -2
View File
@@ -231,8 +231,8 @@ BOOST_MOVE_FORCEINLINE void adl_move_swap(T& x, T& y)
//! using boost::adl_move_swap.
//!
//! Parameters:
//! first1, last1 - the first range of elements to swap
//! first2 - beginning of the second range of elements to swap
//! first1, last1 - the first range of elements to swap
//! first2 - beginning of the second range of elements to swap
//!
//! Type requirements:
//! - ForwardIt1, ForwardIt2 must meet the requirements of ForwardIterator.
+1 -1
View File
@@ -56,7 +56,7 @@ void adaptive_merge( RandIt first, RandIt middle, RandIt last, Compare comp
typedef typename iterator_traits<RandIt>::value_type value_type;
::boost::movelib::detail_adaptive::adaptive_xbuf<value_type> xbuf(uninitialized, uninitialized_len);
::boost::movelib::detail_adaptive::adaptive_merge_impl(first, size_type(middle - first), size_type(last - middle), comp, xbuf);
::boost::movelib::detail_adaptive::adaptive_merge_impl(first, size_type(middle - first), size_type(last - middle), comp, xbuf);
}
} //namespace movelib {
+6 -6
View File
@@ -167,7 +167,7 @@ void op_merge_left( RandIt buf_first
op(forward_t(), first2, last2, buf_first);
return;
}
else if(comp(*first2, *first1)){
else if(comp(*first2, *first1)){
op(first2, buf_first);
++first2;
}
@@ -214,7 +214,7 @@ void op_merge_right
{
RandIt const first2 = last1;
while(first1 != last1){
if(last2 == first2){
if(last2 == first2){
op(backward_t(), first1, last1, buf_last);
return;
}
@@ -230,7 +230,7 @@ void op_merge_right
++last1;
}
}
if(last2 != buf_last){ //In case all remaining elements are in the same place
if(last2 != buf_last){ //In case all remaining elements are in the same place
//(e.g. buffer is exactly the size of the first half
//and all elements from the second half are less)
op(backward_t(), first2, last2, buf_last);
@@ -257,7 +257,7 @@ void swap_merge_right
op_merge_right(first1, last1, last2, buf_last, comp, swap_op());
}
// cost: min(L1,L2)^2+max(L1,L2)
//Complexity: min(len1,len2)^2 + max(len1,len2)
template<class RandIt, class Compare>
void merge_bufferless(RandIt first, RandIt middle, RandIt last, Compare comp)
{
@@ -271,12 +271,12 @@ void merge_bufferless(RandIt first, RandIt middle, RandIt last, Compare comp)
}
do{
++first;
} while(first != middle && !comp(*middle, *first));
} while(first != middle && !comp(*middle, *first));
}
}
else{
while(middle != last){
RandIt p = upper_bound(first, middle, last[-1], comp);
RandIt p = upper_bound(first, middle, last[-1], comp);
last = rotate_gcd(p, middle, last);
middle = p;
if(middle == first){
+2 -2
View File
@@ -125,10 +125,10 @@ F uninitialized_move(I f, I l, F r
}
}
BOOST_CATCH(...){
for (; back != r; ++back){
for (; back != r; ++back){
back->~input_value_type();
}
BOOST_RETHROW;
BOOST_RETHROW;
}
BOOST_CATCH_END
return r;
+2 -2
View File
@@ -1005,7 +1005,7 @@ BOOST_MOVE_ALIGNED_STORAGE_WITH_BOOST_ALIGNMENT(0x1000)
template<class T, std::size_t Len>
union aligned_union
{
{
T aligner;
char dummy[Len];
};
@@ -1023,7 +1023,7 @@ struct aligned_next<Len, Align, T, true>
//End of search defaults to max_align_t
template<std::size_t Len, std::size_t Align>
struct aligned_next<Len, Align, max_align_t, false>
{ typedef aligned_union<max_align_t, Len> type; };
{ typedef aligned_union<max_align_t, Len> type; };
//Now define a search list through types
#define BOOST_MOVE_ALIGNED_NEXT_STEP(TYPE, NEXT_TYPE)\