Skip to content

Commit 08b8fc6

Browse files
authored
cleanup (#48)
1 parent 58c9f10 commit 08b8fc6

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

inc/mkn/kul/zip.hpp

+4-20
Original file line numberDiff line numberDiff line change
@@ -36,36 +36,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3636

3737
namespace mkn::kul {
3838

39-
template <std::size_t Is, typename Tuple>
40-
struct Element {
41-
using C = std::tuple_element_t<Is, Tuple>;
42-
using T = typename C::value_type; // const containers do not have const value_types
43-
using value_type = std::conditional_t<std::is_const_v<C>, T const&, T&>;
44-
};
45-
46-
template <typename Tuple, std::size_t... Is>
47-
constexpr auto tuple_element_value_type_refs_(Tuple, std::index_sequence<Is...> const&&)
48-
-> std::tuple<typename Element<Is, Tuple>::value_type...>;
49-
50-
template <typename... Args>
51-
auto constexpr tuple_element_value_type_refs()
52-
-> decltype(tuple_element_value_type_refs_(std::tuple<Args...>{},
53-
std::make_index_sequence<sizeof...(Args)>{}));
54-
5539
template <typename Tuple, std::size_t... Is>
56-
constexpr auto get_tuple_element_value_type_refs_(Tuple& tup, std::size_t index,
40+
constexpr auto _tuple_element_value_type_refs_(Tuple& tup, std::size_t index,
5741
std::index_sequence<Is...> const&&) {
5842
return std::forward_as_tuple(std::get<Is>(tup)[index]...);
5943
}
6044
template <typename Tuple>
61-
auto constexpr get_tuple_element_value_type_refs(Tuple& tuple, std::size_t index) {
62-
return get_tuple_element_value_type_refs_(tuple, index,
45+
auto constexpr _tuple_element_value_type_refs(Tuple& tuple, std::size_t index) {
46+
return _tuple_element_value_type_refs_(tuple, index,
6347
std::make_index_sequence<std::tuple_size_v<Tuple>>{});
6448
}
6549

6650
template <typename... Args>
6751
struct Zipit {
68-
auto operator*() { return get_tuple_element_value_type_refs(args, idx); }
52+
auto operator*() { return _tuple_element_value_type_refs(args, idx); }
6953
bool operator==(Zipit const& that) const { return idx == that.idx; }
7054
bool operator!=(Zipit const& that) const { return !(*(this) == that); }
7155
auto& operator++() {

0 commit comments

Comments
 (0)