Skip to content

Commit d967269

Browse files
committed
Added agg::count()
Also, reformatted
1 parent 2cdce8e commit d967269

File tree

11 files changed

+265
-257
lines changed

11 files changed

+265
-257
lines changed

mainframe/base.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Copyright Ted Middleton 2022.
32
// Distributed under the Boost Software License, Version 1.0.
43
// (See accompanying file LICENSE_1_0.txt or copy at

mainframe/base.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Copyright Ted Middleton 2022.
32
// Distributed under the Boost Software License, Version 1.0.
43
// (See accompanying file LICENSE_1_0.txt or copy at

mainframe/expression.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Copyright Ted Middleton 2022.
32
// Distributed under the Boost Software License, Version 1.0.
43
// (See accompanying file LICENSE_1_0.txt or copy at

mainframe/frame.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Copyright Ted Middleton 2022.
32
// Distributed under the Boost Software License, Version 1.0.
43
// (See accompanying file LICENSE_1_0.txt or copy at

mainframe/frame_iterator.hpp

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Copyright Ted Middleton 2022.
32
// Distributed under the Boost Software License, Version 1.0.
43
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -829,41 +828,41 @@ using const_reverse_frame_iterator = base_frame_iterator<true, true, Ts...>;
829828

830829
namespace std
831830
{
832-
template<bool IsConst, typename... Ts>
833-
struct hash<mf::_base_frame_row<IsConst, Ts...>>
834-
{
835-
template<size_t Ind=0>
836-
size_t
837-
operator()(const mf::_base_frame_row<IsConst, Ts...>& fr) const
838-
{
839-
using T = typename mf::detail::pack_element<Ind, Ts...>::type;
840-
std::hash<T> hasher;
841-
mf::columnindex<Ind> ci;
842-
size_t out = hasher(fr.at( ci ));
843-
if constexpr (Ind + 1 < sizeof...(Ts)) {
844-
out ^= operator()<Ind + 1>(fr);
845-
}
846-
return out;
847-
}
848-
};
849-
850-
template<bool IsConst, typename... Ts>
851-
struct hash<mf::_row_proxy<IsConst, Ts...>>
852-
{
853-
template<size_t Ind=0>
854-
size_t
855-
operator()(const mf::_row_proxy<IsConst, Ts...>& fr) const
856-
{
857-
using T = typename mf::detail::pack_element<Ind, Ts...>::type;
858-
std::hash<T> hasher;
859-
mf::columnindex<Ind> ci;
860-
size_t out = hasher(fr.at( ci ));
861-
if constexpr (Ind + 1 < sizeof...(Ts)) {
862-
out ^= operator()<Ind + 1>(fr);
863-
}
864-
return out;
831+
template<bool IsConst, typename... Ts>
832+
struct hash<mf::_base_frame_row<IsConst, Ts...>>
833+
{
834+
template<size_t Ind = 0>
835+
size_t
836+
operator()(const mf::_base_frame_row<IsConst, Ts...>& fr) const
837+
{
838+
using T = typename mf::detail::pack_element<Ind, Ts...>::type;
839+
std::hash<T> hasher;
840+
mf::columnindex<Ind> ci;
841+
size_t out = hasher(fr.at(ci));
842+
if constexpr (Ind + 1 < sizeof...(Ts)) {
843+
out ^= operator()<Ind + 1>(fr);
865844
}
866-
};
845+
return out;
846+
}
847+
};
848+
849+
template<bool IsConst, typename... Ts>
850+
struct hash<mf::_row_proxy<IsConst, Ts...>>
851+
{
852+
template<size_t Ind = 0>
853+
size_t
854+
operator()(const mf::_row_proxy<IsConst, Ts...>& fr) const
855+
{
856+
using T = typename mf::detail::pack_element<Ind, Ts...>::type;
857+
std::hash<T> hasher;
858+
mf::columnindex<Ind> ci;
859+
size_t out = hasher(fr.at(ci));
860+
if constexpr (Ind + 1 < sizeof...(Ts)) {
861+
out ^= operator()<Ind + 1>(fr);
862+
}
863+
return out;
864+
}
865+
};
867866
} // namespace std
868867

869868
#endif // INCLUDED_mainframe_frame_iterator_h

0 commit comments

Comments
 (0)