|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r86310 - in trunk: boost/algorithm/cxx14 libs/algorithm/string/test libs/algorithm/test libs/array/test
From: marshall_at_[hidden]
Date: 2013-10-14 17:31:19
Author: marshall
Date: 2013-10-14 17:31:19 EDT (Mon, 14 Oct 2013)
New Revision: 86310
URL: http://svn.boost.org/trac/boost/changeset/86310
Log:
Remove tabs
Text files modified:
trunk/boost/algorithm/cxx14/equal.hpp | 82 ++++++++++++++++++++--------------------
trunk/boost/algorithm/cxx14/mismatch.hpp | 16 +++---
trunk/libs/algorithm/string/test/find_test.cpp | 26 ++++++------
trunk/libs/algorithm/string/test/split_test.cpp | 4
trunk/libs/algorithm/test/iterator_test.hpp | 20 ++++----
trunk/libs/array/test/array_constexpr.cpp | 5 -
trunk/libs/array/test/array_getfail1.cpp | 5 -
7 files changed, 78 insertions(+), 80 deletions(-)
Modified: trunk/boost/algorithm/cxx14/equal.hpp
==============================================================================
--- trunk/boost/algorithm/cxx14/equal.hpp Mon Oct 14 17:19:12 2013 (r86309)
+++ trunk/boost/algorithm/cxx14/equal.hpp 2013-10-14 17:31:19 EDT (Mon, 14 Oct 2013) (r86310)
@@ -12,41 +12,41 @@
#ifndef BOOST_ALGORITHM_EQUAL_HPP
#define BOOST_ALGORITHM_EQUAL_HPP
-#include <algorithm> // for std::equal
-#include <functional> // for std::equal_to
+#include <algorithm> // for std::equal
+#include <functional> // for std::equal_to
namespace boost { namespace algorithm {
namespace detail {
- template <class T1, class T2>
- struct eq : public std::binary_function<T1, T2, bool> {
- bool operator () ( const T1& v1, const T2& v2 ) const { return v1 == v2 ;}
- };
-
- template <class RandomAccessIterator1, class RandomAccessIterator2, class BinaryPredicate>
- bool equal ( RandomAccessIterator1 first1, RandomAccessIterator1 last1,
- RandomAccessIterator2 first2, RandomAccessIterator2 last2, BinaryPredicate pred,
- std::random_access_iterator_tag, std::random_access_iterator_tag )
- {
- // Random-access iterators let is check the sizes in constant time
- if ( std::distance ( first1, last1 ) != std::distance ( first2, last2 ))
- return false;
- // If we know that the sequences are the same size, the original version is fine
- return std::equal ( first1, last1, first2, pred );
- }
-
- template <class InputIterator1, class InputIterator2, class BinaryPredicate>
- bool equal ( InputIterator1 first1, InputIterator1 last1,
- InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred,
- std::input_iterator_tag, std::input_iterator_tag )
- {
- for (; first1 != last1 && first2 != last2; ++first1, ++first2 )
- if ( !pred(*first1, *first2 ))
- return false;
+ template <class T1, class T2>
+ struct eq : public std::binary_function<T1, T2, bool> {
+ bool operator () ( const T1& v1, const T2& v2 ) const { return v1 == v2 ;}
+ };
+
+ template <class RandomAccessIterator1, class RandomAccessIterator2, class BinaryPredicate>
+ bool equal ( RandomAccessIterator1 first1, RandomAccessIterator1 last1,
+ RandomAccessIterator2 first2, RandomAccessIterator2 last2, BinaryPredicate pred,
+ std::random_access_iterator_tag, std::random_access_iterator_tag )
+ {
+ // Random-access iterators let is check the sizes in constant time
+ if ( std::distance ( first1, last1 ) != std::distance ( first2, last2 ))
+ return false;
+ // If we know that the sequences are the same size, the original version is fine
+ return std::equal ( first1, last1, first2, pred );
+ }
+
+ template <class InputIterator1, class InputIterator2, class BinaryPredicate>
+ bool equal ( InputIterator1 first1, InputIterator1 last1,
+ InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred,
+ std::input_iterator_tag, std::input_iterator_tag )
+ {
+ for (; first1 != last1 && first2 != last2; ++first1, ++first2 )
+ if ( !pred(*first1, *first2 ))
+ return false;
- return first1 == last1 && first2 == last2;
- }
+ return first1 == last1 && first2 == last2;
+ }
}
/// \fn equal ( InputIterator1 first1, InputIterator1 last1,
@@ -63,10 +63,10 @@
bool equal ( InputIterator1 first1, InputIterator1 last1,
InputIterator2 first2, InputIterator2 last2, BinaryPredicate pred )
{
- return boost::algorithm::detail::equal (
- first1, last1, first2, last2, pred,
- typename std::iterator_traits<InputIterator1>::iterator_category (),
- typename std::iterator_traits<InputIterator2>::iterator_category ());
+ return boost::algorithm::detail::equal (
+ first1, last1, first2, last2, pred,
+ typename std::iterator_traits<InputIterator1>::iterator_category (),
+ typename std::iterator_traits<InputIterator2>::iterator_category ());
}
/// \fn equal ( InputIterator1 first1, InputIterator1 last1,
@@ -81,16 +81,16 @@
bool equal ( InputIterator1 first1, InputIterator1 last1,
InputIterator2 first2, InputIterator2 last2 )
{
- return boost::algorithm::detail::equal (
- first1, last1, first2, last2,
- boost::algorithm::detail::eq<
- typename std::iterator_traits<InputIterator1>::value_type,
- typename std::iterator_traits<InputIterator2>::value_type> (),
- typename std::iterator_traits<InputIterator1>::iterator_category (),
- typename std::iterator_traits<InputIterator2>::iterator_category ());
+ return boost::algorithm::detail::equal (
+ first1, last1, first2, last2,
+ boost::algorithm::detail::eq<
+ typename std::iterator_traits<InputIterator1>::value_type,
+ typename std::iterator_traits<InputIterator2>::value_type> (),
+ typename std::iterator_traits<InputIterator1>::iterator_category (),
+ typename std::iterator_traits<InputIterator2>::iterator_category ());
}
-// There are already range-based versions of these.
+// There are already range-based versions of these.
}} // namespace boost and algorithm
Modified: trunk/boost/algorithm/cxx14/mismatch.hpp
==============================================================================
--- trunk/boost/algorithm/cxx14/mismatch.hpp Mon Oct 14 17:19:12 2013 (r86309)
+++ trunk/boost/algorithm/cxx14/mismatch.hpp 2013-10-14 17:31:19 EDT (Mon, 14 Oct 2013) (r86310)
@@ -12,8 +12,8 @@
#ifndef BOOST_ALGORITHM_MISMATCH_HPP
#define BOOST_ALGORITHM_MISMATCH_HPP
-#include <algorithm> // for std::mismatch
-#include <utility> // for std::pair
+#include <algorithm> // for std::mismatch
+#include <utility> // for std::pair
namespace boost { namespace algorithm {
@@ -29,9 +29,9 @@
/// \param pred A predicate for comparing the elements of the ranges
template <class InputIterator1, class InputIterator2, class BinaryPredicate>
std::pair<InputIterator1, InputIterator2> mismatch (
- InputIterator1 first1, InputIterator1 last1,
- InputIterator2 first2, InputIterator2 last2,
- BinaryPredicate pred )
+ InputIterator1 first1, InputIterator1 last1,
+ InputIterator2 first2, InputIterator2 last2,
+ BinaryPredicate pred )
{
for (; first1 != last1 && first2 != last2; ++first1, ++first2)
if ( !pred ( *first1, *first2 ))
@@ -49,8 +49,8 @@
/// \param last2 One past the end of the second range.
template <class InputIterator1, class InputIterator2>
std::pair<InputIterator1, InputIterator2> mismatch (
- InputIterator1 first1, InputIterator1 last1,
- InputIterator2 first2, InputIterator2 last2 )
+ InputIterator1 first1, InputIterator1 last1,
+ InputIterator2 first2, InputIterator2 last2 )
{
for (; first1 != last1 && first2 != last2; ++first1, ++first2)
if ( *first1 != *first2 )
@@ -58,7 +58,7 @@
return std::pair<InputIterator1, InputIterator2>(first1, first2);
}
-// There are already range-based versions of these.
+// There are already range-based versions of these.
}} // namespace boost and algorithm
Modified: trunk/libs/algorithm/string/test/find_test.cpp
==============================================================================
--- trunk/libs/algorithm/string/test/find_test.cpp Mon Oct 14 17:19:12 2013 (r86309)
+++ trunk/libs/algorithm/string/test/find_test.cpp 2013-10-14 17:31:19 EDT (Mon, 14 Oct 2013) (r86310)
@@ -181,20 +181,20 @@
( (cv_result.begin()-str1.begin()) == 3) &&
( (cv_result.end()-str1.begin()) == 6) );
- string s1("abc def ghi jkl");
- find_iterator<string::iterator> fEnd;
+ string s1("abc def ghi jkl");
+ find_iterator<string::iterator> fEnd;
- find_iterator<string::iterator> fxIt = make_find_iterator(s1,
- token_finder(is_alnum(), token_compress_on));
- BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("abc")));
- ++fxIt;
- BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("def")));
- ++fxIt;
- BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("ghi")));
- ++fxIt;
- BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("jkl")));
- ++fxIt;
- BOOST_CHECK(fxIt == fEnd);
+ find_iterator<string::iterator> fxIt = make_find_iterator(s1,
+ token_finder(is_alnum(), token_compress_on));
+ BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("abc")));
+ ++fxIt;
+ BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("def")));
+ ++fxIt;
+ BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("ghi")));
+ ++fxIt;
+ BOOST_CHECK((fxIt != fEnd) && (*fxIt == string("jkl")));
+ ++fxIt;
+ BOOST_CHECK(fxIt == fEnd);
nc_result=find_token( str1, is_any_of("abc"), token_compress_off );
BOOST_CHECK(
Modified: trunk/libs/algorithm/string/test/split_test.cpp
==============================================================================
--- trunk/libs/algorithm/string/test/split_test.cpp Mon Oct 14 17:19:12 2013 (r86309)
+++ trunk/libs/algorithm/string/test/split_test.cpp 2013-10-14 17:31:19 EDT (Mon, 14 Oct 2013) (r86310)
@@ -46,7 +46,7 @@
const char* pch1="xx-abc--xx-abb";
vector<string> tokens;
vector< vector<int> > vtokens;
-
+
// find_all tests
find_all(
tokens,
@@ -182,7 +182,7 @@
BOOST_CHECK(siter==split_iterator<string::iterator>());
// Make sure we work with forward iterators
-// See bug #7989
+// See bug #7989
list<char> l1;
find_iterator<list<char>::iterator> liter=make_find_iterator(l1, first_finder("xx"));
}
Modified: trunk/libs/algorithm/test/iterator_test.hpp
==============================================================================
--- trunk/libs/algorithm/test/iterator_test.hpp Mon Oct 14 17:19:12 2013 (r86309)
+++ trunk/libs/algorithm/test/iterator_test.hpp 2013-10-14 17:31:19 EDT (Mon, 14 Oct 2013) (r86310)
@@ -2,11 +2,11 @@
#define ITERATOR_TEST_H
/*
- A set of iterator adapters for constructing test cases
- From an iterator (or a pointer), you can make any class of iterator.
- Assuming you want to degrade the capabilities.
-
- Modeled closely on work that Howard Hinnant did for libc++.
+ A set of iterator adapters for constructing test cases
+ From an iterator (or a pointer), you can make any class of iterator.
+ Assuming you want to degrade the capabilities.
+
+ Modeled closely on work that Howard Hinnant did for libc++.
*/
#include <iterator>
@@ -269,10 +269,10 @@
private:
It it_;
template <typename U> friend class output_iterator;
- };
-
-// No comparison operators for output iterators
-
+ };
+
+// No comparison operators for output iterators
+
// == Get the base of an iterator; used for comparisons ==
template <typename Iter>
@@ -290,7 +290,7 @@
template <typename Iter>
inline Iter base(random_access_iterator<Iter> i) { return i.base(); }
-template <typename Iter> // everything else
+template <typename Iter> // everything else
inline Iter base(Iter i) { return i; }
#endif // ITERATORS_H
Modified: trunk/libs/array/test/array_constexpr.cpp
==============================================================================
--- trunk/libs/array/test/array_constexpr.cpp Mon Oct 14 17:19:12 2013 (r86309)
+++ trunk/libs/array/test/array_constexpr.cpp 2013-10-14 17:31:19 EDT (Mon, 14 Oct 2013) (r86310)
@@ -32,12 +32,11 @@
constexpr int three = arr.at (3);
int whatever [ arr.at(4) ];
(void)three;
- (void) whatever;
+ (void) whatever;
}
-#else // no constexpr means no constexpr tests!
+#else // no constexpr means no constexpr tests!
BOOST_AUTO_TEST_CASE( test_main )
{
}
#endif
-
Modified: trunk/libs/array/test/array_getfail1.cpp
==============================================================================
--- trunk/libs/array/test/array_getfail1.cpp Mon Oct 14 17:19:12 2013 (r86309)
+++ trunk/libs/array/test/array_getfail1.cpp 2013-10-14 17:31:19 EDT (Mon, 14 Oct 2013) (r86310)
@@ -29,7 +29,7 @@
typedef T arr[5];
test_type test_case; // = { 1, 1, 2, 3, 5 };
- T &aRef = std::get<5> ( test_case ); // should fail to compile
+ T &aRef = std::get<5> ( test_case ); // should fail to compile
BOOST_CHECK ( &*test_case.begin () == &aRef );
}
#endif
@@ -44,7 +44,6 @@
RunStdTests< long double >();
RunStdTests< std::string >();
#else
- BOOST_STATIC_ASSERT ( false ); // fail on C++03 systems.
+ BOOST_STATIC_ASSERT ( false ); // fail on C++03 systems.
#endif
}
-
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk