mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-02 14:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for GCC4.8 RC

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-03-21 20:00:42 +09:00
parent 57bcbc6cdb
commit 2cb55b6b6c
55 changed files with 48 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sprout/algorithm/adjacent_find.hpp
View file

@ -94,7 +94,6 @@ namespace sprout {
ForwardIterator last, BinaryPredicate pred, typename std::iterator_traits<ForwardIterator>::difference_type n
)
{
typedef sprout::pair<ForwardIterator, ForwardIterator> type;
return current.second == last ? current
: sprout::detail::adjacent_find_impl(
sprout::detail::adjacent_find_impl_1(

1
sprout/algorithm/all_of.hpp
View file

@ -69,7 +69,6 @@ namespace sprout {
InputIterator last, Predicate pred, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return !current.second || current.first == last ? current
: sprout::detail::all_of_impl(
sprout::detail::all_of_impl_1(

1
sprout/algorithm/all_of_equal.hpp
View file

@ -69,7 +69,6 @@ namespace sprout {
InputIterator last, T const& value, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return !current.second || current.first == last ? current
: sprout::detail::all_of_equal_impl(
sprout::detail::all_of_equal_impl_1(

1
sprout/algorithm/any_of.hpp
View file

@ -69,7 +69,6 @@ namespace sprout {
InputIterator last, Predicate pred, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return current.second || current.first == last ? current
: sprout::detail::any_of_impl(
sprout::detail::any_of_impl_1(

1
sprout/algorithm/any_of_equal.hpp
View file

@ -69,7 +69,6 @@ namespace sprout {
InputIterator last, T const& value, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return current.second || current.first == last ? current
: sprout::detail::any_of_equal_impl(
sprout::detail::any_of_equal_impl_1(

1
sprout/algorithm/count.hpp
View file

@ -69,7 +69,6 @@ namespace sprout {
InputIterator last, T const& value, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.first == last ? current
: sprout::detail::count_impl(
sprout::detail::count_impl_1(

1
sprout/algorithm/count_if.hpp
View file

@ -69,7 +69,6 @@ namespace sprout {
InputIterator last, Predicate pred, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.first == last ? current
: sprout::detail::count_if_impl(
sprout::detail::count_if_impl_1(

1
sprout/algorithm/equal.hpp
View file

@ -76,7 +76,6 @@ namespace sprout {
InputIterator1 last1, BinaryPredicate pred, typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::tuples::tuple<InputIterator1, InputIterator2, bool> type;
return !sprout::tuples::get<2>(current) || sprout::tuples::get<0>(current) == last1 ? current
: sprout::detail::equal_impl(
sprout::detail::equal_impl_1(

1
sprout/algorithm/find.hpp
View file

@ -71,7 +71,6 @@ namespace sprout {
InputIterator last, T const& value, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return current.second || current.first == last ? current
: sprout::detail::find_impl(
sprout::detail::find_impl_1(

1
sprout/algorithm/find_difference.hpp
View file

@ -59,7 +59,6 @@ namespace sprout {
InputIterator1 last1, InputIterator2 last2, Compare comp, typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::tuples::tuple<InputIterator1, InputIterator2, bool> type;
return sprout::tuples::get<2>(current) || sprout::tuples::get<0>(current) == last1 ? current
: sprout::detail::find_difference_impl(
sprout::detail::find_difference_impl_1(

2
sprout/algorithm/find_end.hpp
View file

@ -94,7 +94,6 @@ namespace sprout {
typename std::iterator_traits<ForwardIterator1>::difference_type n
)
{
typedef sprout::pair<ForwardIterator1, ForwardIterator1> type;
return current.first == last1 ? current
: n == 1 ? sprout::detail::find_end_impl_check(
current, last1,
@ -117,7 +116,6 @@ namespace sprout {
typename std::iterator_traits<ForwardIterator1>::difference_type n
)
{
typedef sprout::pair<ForwardIterator1, ForwardIterator1> type;
return current.first == last1 ? current
: sprout::detail::find_end_impl(
sprout::detail::find_end_impl_1(

1
sprout/algorithm/find_first_of.hpp
View file

@ -85,7 +85,6 @@ namespace sprout {
typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::pair<InputIterator1, bool> type;
return current.second || current.first == last1 ? current
: sprout::detail::find_first_of_impl(
sprout::detail::find_first_of_impl_1(

1
sprout/algorithm/find_if.hpp
View file

@ -71,7 +71,6 @@ namespace sprout {
InputIterator last, Predicate pred, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return current.second || current.first == last ? current
: sprout::detail::find_if_impl(
sprout::detail::find_if_impl_1(

1
sprout/algorithm/find_if_not.hpp
View file

@ -71,7 +71,6 @@ namespace sprout {
InputIterator last, Predicate pred, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return current.second || current.first == last ? current
: sprout::detail::find_if_not_impl(
sprout::detail::find_if_not_impl_1(

1
sprout/algorithm/find_intersection.hpp
View file

@ -57,7 +57,6 @@ namespace sprout {
InputIterator1 last1, InputIterator2 last2, Compare comp, typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::tuples::tuple<InputIterator1, InputIterator2, bool> type;
return sprout::tuples::get<2>(current) || sprout::tuples::get<0>(current) == last1 || sprout::tuples::get<1>(current) == last2 ? current
: sprout::detail::find_intersection_impl(
sprout::detail::find_intersection_impl_1(

1
sprout/algorithm/find_symmetric_difference.hpp
View file

@ -48,7 +48,6 @@ namespace sprout {
InputIterator1 last1, InputIterator2 last2, Compare comp, typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::tuples::tuple<InputIterator1, InputIterator2, bool> type;
return sprout::tuples::get<2>(current) || sprout::tuples::get<0>(current) == last1 ? current
: sprout::detail::find_symmetric_difference_impl(
sprout::detail::find_symmetric_difference_impl_1(

1
sprout/algorithm/fixed/bogo_sort_result.hpp
View file

@ -45,7 +45,6 @@ namespace sprout {
Compare comp, Difference n
)
{
typedef sprout::pair<ResultType, bool> type;
return current.second ? current
: sprout::fixed::detail::bogo_sort_result_impl<ResultType>(
sprout::fixed::detail::bogo_sort_result_impl_1<ResultType>(

1
sprout/algorithm/fixed/bozo_sort_result.hpp
View file

@ -45,7 +45,6 @@ namespace sprout {
Compare comp, Difference n
)
{
typedef sprout::pair<ResultType, bool> type;
return current.second ? current
: sprout::fixed::detail::bozo_sort_result_impl<ResultType>(
sprout::fixed::detail::bozo_sort_result_impl_1<ResultType>(

1
sprout/algorithm/includes.hpp
View file

@ -82,7 +82,6 @@ namespace sprout {
typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::pair<InputIterator1, InputIterator2> type;
return current.second == last2 || current.first == last1 ? current
: sprout::detail::includes_impl(
sprout::detail::includes_impl_1(

1
sprout/algorithm/is_partitioned.hpp
View file

@ -63,7 +63,6 @@ namespace sprout {
InputIterator last, Predicate pred, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.second > 1 || current.first == last ? current
: sprout::detail::is_partitioned_impl(
sprout::detail::is_partitioned_impl_1(

1
sprout/algorithm/is_permutation.hpp
View file

@ -84,7 +84,6 @@ namespace sprout {
BinaryPredicate pred, typename std::iterator_traits<ForwardIterator1>::difference_type n
)
{
typedef sprout::pair<ForwardIterator1, bool> type;
return !current.second || current.first == last1 ? current
: sprout::detail::is_permutation_impl(
sprout::detail::is_permutation_impl_1(

1
sprout/algorithm/is_sorted_until.hpp
View file

@ -79,7 +79,6 @@ namespace sprout {
ForwardIterator last, Compare comp, typename std::iterator_traits<ForwardIterator>::difference_type n
)
{
typedef sprout::pair<ForwardIterator, ForwardIterator> type;
return current.second == last ? current
: sprout::detail::is_sorted_until_impl(
sprout::detail::is_sorted_until_impl_1(

1
sprout/algorithm/lexicographical_compare.hpp
View file

@ -111,7 +111,6 @@ namespace sprout {
typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::pair<InputIterator1, InputIterator2> type;
return current.second == last2 || current.first == last1 ? current
: sprout::detail::lexicographical_compare_impl(
sprout::detail::lexicographical_compare_impl_1(

1
sprout/algorithm/max_element.hpp
View file

@ -82,7 +82,6 @@ namespace sprout {
ForwardIterator last, Compare comp, typename std::iterator_traits<ForwardIterator>::difference_type n
)
{
typedef sprout::pair<ForwardIterator, ForwardIterator> type;
return current.first == last ? current
: sprout::detail::max_element_impl(
sprout::detail::max_element_impl_1(

1
sprout/algorithm/min_element.hpp
View file

@ -82,7 +82,6 @@ namespace sprout {
ForwardIterator last, Compare comp, typename std::iterator_traits<ForwardIterator>::difference_type n
)
{
typedef sprout::pair<ForwardIterator, ForwardIterator> type;
return current.first == last ? current
: sprout::detail::min_element_impl(
sprout::detail::min_element_impl_1(

1
sprout/algorithm/minmax_element.hpp
View file

@ -94,7 +94,6 @@ namespace sprout {
ForwardIterator last, Compare comp, typename std::iterator_traits<ForwardIterator>::difference_type n
)
{
typedef sprout::pair<ForwardIterator, sprout::pair<ForwardIterator, ForwardIterator> > type;
return current.first == last ? current
: sprout::detail::minmax_element_impl(
sprout::detail::minmax_element_impl_1(

1
sprout/algorithm/mismatch.hpp
View file

@ -97,7 +97,6 @@ namespace sprout {
InputIterator1 last1, BinaryPredicate pred, typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::tuples::tuple<InputIterator1, InputIterator2, bool> type;
return sprout::tuples::get<2>(current) || sprout::tuples::get<0>(current) == last1 ? current
: sprout::detail::mismatch_impl(
sprout::detail::mismatch_impl_1(

1
sprout/algorithm/none_of.hpp
View file

@ -69,7 +69,6 @@ namespace sprout {
InputIterator last, Predicate pred, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return !current.second || current.first == last ? current
: sprout::detail::none_of_impl(
sprout::detail::none_of_impl_1(

1
sprout/algorithm/none_of_equal.hpp
View file

@ -69,7 +69,6 @@ namespace sprout {
InputIterator last, T const& value, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, bool> type;
return !current.second || current.first == last ? current
: sprout::detail::none_of_equal_impl(
sprout::detail::none_of_equal_impl_1(

1
sprout/algorithm/one_of.hpp
View file

@ -93,7 +93,6 @@ namespace sprout {
InputIterator last, Predicate pred, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.second > 1 || current.first == last ? current
: sprout::detail::one_of_impl(
sprout::detail::one_of_impl_1(

1
sprout/algorithm/one_of_equal.hpp
View file

@ -93,7 +93,6 @@ namespace sprout {
InputIterator last, T const& value, typename std::iterator_traits<InputIterator>::difference_type n
)
{
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.second > 1 || current.first == last ? current
: sprout::detail::one_of_equal_impl(
sprout::detail::one_of_equal_impl_1(

2
sprout/algorithm/search.hpp
View file

@ -70,7 +70,6 @@ namespace sprout {
typename std::iterator_traits<ForwardIterator1>::difference_type n
)
{
typedef sprout::pair<ForwardIterator1, bool> type;
return current.second || current.first == last1 ? current
: n == 1 ? sprout::detail::search_impl_fork(
current, last1,
@ -93,7 +92,6 @@ namespace sprout {
typename std::iterator_traits<ForwardIterator1>::difference_type n
)
{
typedef sprout::pair<ForwardIterator1, bool> type;
return current.second || current.first == last1 ? current
: sprout::detail::search_impl(
sprout::detail::search_impl_1(

2
sprout/algorithm/tristate_lexicographical_compare.hpp
View file

@ -114,7 +114,6 @@ namespace sprout {
typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::pair<InputIterator1, InputIterator2> type;
return current.second == last2 || current.first == last1 ? current
: sprout::detail::tristate_lexicographical_compare_impl(
sprout::detail::tristate_lexicographical_compare_impl_1(
@ -281,7 +280,6 @@ namespace sprout {
typename std::iterator_traits<InputIterator1>::difference_type n
)
{
typedef sprout::pair<InputIterator1, InputIterator2> type;
return current.second == last2 || current.first == last1 ? current
: sprout::detail::tristate_lexicographical_compare_impl(
sprout::detail::tristate_lexicographical_compare_impl_1(