Skip to content

Commit 4c3b17c

Browse files
committed
Remove tabs
[SVN r86310]
1 parent ef78dde commit 4c3b17c

File tree

5 files changed

+74
-74
lines changed

5 files changed

+74
-74
lines changed

include/boost/algorithm/cxx14/equal.hpp

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,41 @@
1212
#ifndef BOOST_ALGORITHM_EQUAL_HPP
1313
#define BOOST_ALGORITHM_EQUAL_HPP
1414

15-
#include <algorithm> // for std::equal
16-
#include <functional> // for std::equal_to
15+
#include <algorithm> // for std::equal
16+
#include <functional> // for std::equal_to
1717

1818
namespace boost { namespace algorithm {
1919

2020
namespace detail {
2121

22-
template <class T1, class T2>
23-
struct eq : public std::binary_function<T1, T2, bool> {
24-
bool operator () ( const T1& v1, const T2& v2 ) const { return v1 == v2 ;}
25-
};
26-
27-
template <class RandomAccessIterator1, class RandomAccessIterator2, class BinaryPredicate>
28-
bool equal ( RandomAccessIterator1 first1, RandomAccessIterator1 last1,
29-
RandomAccessIterator2 first2, RandomAccessIterator2 last2, BinaryPredicate pred,
30-
std::random_access_iterator_tag, std::random_access_iterator_tag )
31-
{
32-
// Random-access iterators let is check the sizes in constant time
33-
if ( std::distance ( first1, last1 ) != std::distance ( first2, last2 ))
34-
return false;
35-
// If we know that the sequences are the same size, the original version is fine
36-
return std::equal ( first1, last1, first2, pred );
37-
}
22+
template <class T1, class T2>
23+
struct eq : public std::binary_function<T1, T2, bool> {
24+
bool operator () ( const T1& v1, const T2& v2 ) const { return v1 == v2 ;}
25+
};
26+
27+
template <class RandomAccessIterator1, class RandomAccessIterator2, class BinaryPredicate>
28+
bool equal ( RandomAccessIterator1 first1, RandomAccessIterator1 last1,
29+
RandomAccessIterator2 first2, RandomAccessIterator2 last2, BinaryPredicate pred,
30+
std::random_access_iterator_tag, std::random_access_iterator_tag )
31+
{
32+
// Random-access iterators let is check the sizes in constant time
33+
if ( std::distance ( first1, last1 ) != std::distance ( first2, last2 ))
34+
return false;
35+
// If we know that the sequences are the same size, the original version is fine
36+
return std::equal ( first1, last1, first2, pred );
37+
}
3838

39-
template <class InputIterator1, class InputIterator2, class BinaryPredicate>
40-
bool equal ( InputIterator1 first1, InputIterator1 last1,
41-
InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred,
42-
std::input_iterator_tag, std::input_iterator_tag )
43-
{
44-
for (; first1 != last1 && first2 != last2; ++first1, ++first2 )
45-
if ( !pred(*first1, *first2 ))
46-
return false;
39+
template <class InputIterator1, class InputIterator2, class BinaryPredicate>
40+
bool equal ( InputIterator1 first1, InputIterator1 last1,
41+
InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred,
42+
std::input_iterator_tag, std::input_iterator_tag )
43+
{
44+
for (; first1 != last1 && first2 != last2; ++first1, ++first2 )
45+
if ( !pred(*first1, *first2 ))
46+
return false;
4747

48-
return first1 == last1 && first2 == last2;
49-
}
48+
return first1 == last1 && first2 == last2;
49+
}
5050
}
5151

5252
/// \fn equal ( InputIterator1 first1, InputIterator1 last1,
@@ -63,10 +63,10 @@ template <class InputIterator1, class InputIterator2, class BinaryPredicate>
6363
bool equal ( InputIterator1 first1, InputIterator1 last1,
6464
InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred )
6565
{
66-
return boost::algorithm::detail::equal (
67-
first1, last1, first2, last2, pred,
68-
typename std::iterator_traits<InputIterator1>::iterator_category (),
69-
typename std::iterator_traits<InputIterator2>::iterator_category ());
66+
return boost::algorithm::detail::equal (
67+
first1, last1, first2, last2, pred,
68+
typename std::iterator_traits<InputIterator1>::iterator_category (),
69+
typename std::iterator_traits<InputIterator2>::iterator_category ());
7070
}
7171

7272
/// \fn equal ( InputIterator1 first1, InputIterator1 last1,
@@ -81,16 +81,16 @@ template <class InputIterator1, class InputIterator2>
8181
bool equal ( InputIterator1 first1, InputIterator1 last1,
8282
InputIterator2 first2, InputIterator2 last2 )
8383
{
84-
return boost::algorithm::detail::equal (
85-
first1, last1, first2, last2,
86-
boost::algorithm::detail::eq<
87-
typename std::iterator_traits<InputIterator1>::value_type,
88-
typename std::iterator_traits<InputIterator2>::value_type> (),
89-
typename std::iterator_traits<InputIterator1>::iterator_category (),
90-
typename std::iterator_traits<InputIterator2>::iterator_category ());
84+
return boost::algorithm::detail::equal (
85+
first1, last1, first2, last2,
86+
boost::algorithm::detail::eq<
87+
typename std::iterator_traits<InputIterator1>::value_type,
88+
typename std::iterator_traits<InputIterator2>::value_type> (),
89+
typename std::iterator_traits<InputIterator1>::iterator_category (),
90+
typename std::iterator_traits<InputIterator2>::iterator_category ());
9191
}
9292

93-
// There are already range-based versions of these.
93+
// There are already range-based versions of these.
9494

9595
}} // namespace boost and algorithm
9696

include/boost/algorithm/cxx14/mismatch.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#ifndef BOOST_ALGORITHM_MISMATCH_HPP
1313
#define BOOST_ALGORITHM_MISMATCH_HPP
1414

15-
#include <algorithm> // for std::mismatch
16-
#include <utility> // for std::pair
15+
#include <algorithm> // for std::mismatch
16+
#include <utility> // for std::pair
1717

1818
namespace boost { namespace algorithm {
1919

@@ -29,9 +29,9 @@ namespace boost { namespace algorithm {
2929
/// \param pred A predicate for comparing the elements of the ranges
3030
template <class InputIterator1, class InputIterator2, class BinaryPredicate>
3131
std::pair<InputIterator1, InputIterator2> mismatch (
32-
InputIterator1 first1, InputIterator1 last1,
33-
InputIterator2 first2, InputIterator2 last2,
34-
BinaryPredicate pred )
32+
InputIterator1 first1, InputIterator1 last1,
33+
InputIterator2 first2, InputIterator2 last2,
34+
BinaryPredicate pred )
3535
{
3636
for (; first1 != last1 && first2 != last2; ++first1, ++first2)
3737
if ( !pred ( *first1, *first2 ))
@@ -49,16 +49,16 @@ std::pair<InputIterator1, InputIterator2> mismatch (
4949
/// \param last2 One past the end of the second range.
5050
template <class InputIterator1, class InputIterator2>
5151
std::pair<InputIterator1, InputIterator2> mismatch (
52-
InputIterator1 first1, InputIterator1 last1,
53-
InputIterator2 first2, InputIterator2 last2 )
52+
InputIterator1 first1, InputIterator1 last1,
53+
InputIterator2 first2, InputIterator2 last2 )
5454
{
5555
for (; first1 != last1 && first2 != last2; ++first1, ++first2)
5656
if ( *first1 != *first2 )
5757
break;
5858
return std::pair<InputIterator1, InputIterator2>(first1, first2);
5959
}
6060

61-
// There are already range-based versions of these.
61+
// There are already range-based versions of these.
6262

6363
}} // namespace boost and algorithm
6464

string/test/find_test.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -181,20 +181,20 @@ void find_test()
181181
( (cv_result.begin()-str1.begin()) == 3) &&
182182
( (cv_result.end()-str1.begin()) == 6) );
183183

184-
string s1("abc def ghi jkl");
185-
find_iterator<string::iterator> fEnd;
186-
187-
find_iterator<string::iterator> fxIt = make_find_iterator(s1,
188-
token_finder(is_alnum(), token_compress_on));
189-
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("abc")));
190-
++fxIt;
191-
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("def")));
192-
++fxIt;
193-
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("ghi")));
194-
++fxIt;
195-
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("jkl")));
196-
++fxIt;
197-
BOOST_CHECK(fxIt == fEnd);
184+
string s1("abc def ghi jkl");
185+
find_iterator<string::iterator> fEnd;
186+
187+
find_iterator<string::iterator> fxIt = make_find_iterator(s1,
188+
token_finder(is_alnum(), token_compress_on));
189+
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("abc")));
190+
++fxIt;
191+
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("def")));
192+
++fxIt;
193+
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("ghi")));
194+
++fxIt;
195+
BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("jkl")));
196+
++fxIt;
197+
BOOST_CHECK(fxIt == fEnd);
198198

199199
nc_result=find_token( str1, is_any_of("abc"), token_compress_off );
200200
BOOST_CHECK(

string/test/split_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void iterator_test()
4646
const char* pch1="xx-abc--xx-abb";
4747
vector<string> tokens;
4848
vector< vector<int> > vtokens;
49-
49+
5050
// find_all tests
5151
find_all(
5252
tokens,
@@ -182,7 +182,7 @@ void iterator_test()
182182
BOOST_CHECK(siter==split_iterator<string::iterator>());
183183

184184
// Make sure we work with forward iterators
185-
// See bug #7989
185+
// See bug #7989
186186
list<char> l1;
187187
find_iterator<list<char>::iterator> liter=make_find_iterator(l1, first_finder("xx"));
188188
}

test/iterator_test.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#define ITERATOR_TEST_H
33

44
/*
5-
A set of iterator adapters for constructing test cases
6-
From an iterator (or a pointer), you can make any class of iterator.
7-
Assuming you want to degrade the capabilities.
8-
9-
Modeled closely on work that Howard Hinnant did for libc++.
5+
A set of iterator adapters for constructing test cases
6+
From an iterator (or a pointer), you can make any class of iterator.
7+
Assuming you want to degrade the capabilities.
8+
9+
Modeled closely on work that Howard Hinnant did for libc++.
1010
*/
1111

1212
#include <iterator>
@@ -269,10 +269,10 @@ class output_iterator {
269269
private:
270270
It it_;
271271
template <typename U> friend class output_iterator;
272-
};
273-
274-
// No comparison operators for output iterators
275-
272+
};
273+
274+
// No comparison operators for output iterators
275+
276276

277277
// == Get the base of an iterator; used for comparisons ==
278278
template <typename Iter>
@@ -290,7 +290,7 @@ inline Iter base(bidirectional_iterator<Iter> i) { return i.base(); }
290290
template <typename Iter>
291291
inline Iter base(random_access_iterator<Iter> i) { return i.base(); }
292292

293-
template <typename Iter> // everything else
293+
template <typename Iter> // everything else
294294
inline Iter base(Iter i) { return i; }
295295

296296
#endif // ITERATORS_H

0 commit comments

Comments
 (0)