From 9dd1637196c59b48d15669bcc94bf9905a94c8a8 Mon Sep 17 00:00:00 2001 From: bqv Date: Sat, 19 Nov 2022 08:26:00 +0000 Subject: [PATCH] drop ranges-v3, hard dep on gcc>12 now --- .depend | 548 +------------------------------------------------- .gitmodules | 3 - deps/range-v3 | 1 - makefile | 2 +- omemo.cpp | 20 +- 5 files changed, 12 insertions(+), 562 deletions(-) delete mode 160000 deps/range-v3 diff --git a/.depend b/.depend index 519fa70..5ef6af3 100644 --- a/.depend +++ b/.depend @@ -566,280 +566,7 @@ xmpp/ns.hh: strophe.hh: user.hh: message.hh: -.omemo.o: omemo.cpp deps/fmt/include/fmt/core.h \ - deps/range-v3/include/range/v3/all.hpp \ - deps/range-v3/include/range/v3/action.hpp \ - deps/range-v3/include/range/v3/action/action.hpp \ - deps/range-v3/include/meta/meta.hpp \ - deps/range-v3/include/meta/meta_fwd.hpp \ - deps/range-v3/include/range/v3/range_fwd.hpp \ - deps/range-v3/include/concepts/concepts.hpp \ - deps/range-v3/include/concepts/swap.hpp \ - deps/range-v3/include/concepts/type_traits.hpp \ - deps/range-v3/include/concepts/compare.hpp \ - deps/range-v3/include/range/v3/compare.hpp \ - deps/range-v3/include/range/v3/detail/config.hpp \ - deps/range-v3/include/range/v3/utility/static_const.hpp \ - deps/range-v3/include/range/v3/version.hpp \ - deps/range-v3/include/range/v3/detail/prologue.hpp \ - deps/range-v3/include/range/v3/detail/epilogue.hpp \ - deps/range-v3/include/range/v3/action/concepts.hpp \ - deps/range-v3/include/range/v3/range/concepts.hpp \ - deps/range-v3/include/range/v3/functional/comparisons.hpp \ - deps/range-v3/include/range/v3/iterator/concepts.hpp \ - deps/range-v3/include/range/v3/functional/concepts.hpp \ - deps/range-v3/include/range/v3/functional/invoke.hpp \ - deps/range-v3/include/range/v3/functional/identity.hpp \ - deps/range-v3/include/range/v3/iterator/access.hpp \ - deps/range-v3/include/std/detail/associated_types.hpp \ - deps/range-v3/include/range/v3/utility/move.hpp \ - deps/range-v3/include/range/v3/utility/swap.hpp \ - deps/range-v3/include/range/v3/iterator/traits.hpp \ - deps/range-v3/include/range/v3/utility/common_type.hpp \ - deps/range-v3/include/range/v3/range/access.hpp \ - deps/range-v3/include/range/v3/iterator/reverse_iterator.hpp \ - deps/range-v3/include/range/v3/iterator/basic_iterator.hpp \ - deps/range-v3/include/range/v3/detail/range_access.hpp \ - deps/range-v3/include/range/v3/utility/addressof.hpp \ - deps/range-v3/include/range/v3/utility/box.hpp \ - deps/range-v3/include/range/v3/utility/get.hpp \ - deps/range-v3/include/range/v3/detail/adl_get.hpp \ - deps/range-v3/include/range/v3/utility/semiregular_box.hpp \ - deps/range-v3/include/range/v3/functional/reference_wrapper.hpp \ - deps/range-v3/include/range/v3/utility/in_place.hpp \ - deps/range-v3/include/range/v3/range/primitives.hpp \ - deps/range-v3/include/range/v3/range/traits.hpp \ - deps/range-v3/include/range/v3/functional/compose.hpp \ - deps/range-v3/include/range/v3/functional/pipeable.hpp \ - deps/range-v3/include/range/v3/action/adjacent_remove_if.hpp \ - deps/range-v3/include/range/v3/action/erase.hpp \ - deps/range-v3/include/range/v3/action/insert.hpp \ - deps/range-v3/include/range/v3/algorithm/max.hpp \ - deps/range-v3/include/range/v3/iterator/common_iterator.hpp \ - deps/range-v3/include/range/v3/detail/variant.hpp \ - deps/range-v3/include/range/v3/utility/common_tuple.hpp \ - deps/range-v3/include/range/v3/functional/bind.hpp \ - deps/range-v3/include/range/v3/utility/tuple_algorithm.hpp \ - deps/range-v3/include/range/v3/algorithm/adjacent_remove_if.hpp \ - deps/range-v3/include/range/v3/algorithm/adjacent_find.hpp \ - deps/range-v3/include/range/v3/range/dangling.hpp \ - deps/range-v3/include/range/v3/algorithm/move.hpp \ - deps/range-v3/include/range/v3/algorithm/result_types.hpp \ - deps/range-v3/include/range/v3/functional/bind_back.hpp \ - deps/range-v3/include/range/v3/action/drop.hpp \ - deps/range-v3/include/range/v3/iterator/operations.hpp \ - deps/range-v3/include/range/v3/action/drop_while.hpp \ - deps/range-v3/include/range/v3/algorithm/find_if_not.hpp \ - deps/range-v3/include/range/v3/action/join.hpp \ - deps/range-v3/include/range/v3/action/push_back.hpp \ - deps/range-v3/include/range/v3/detail/with_braced_init_args.hpp \ - deps/range-v3/include/range/v3/action/push_front.hpp \ - deps/range-v3/include/range/v3/action/remove_if.hpp \ - deps/range-v3/include/range/v3/algorithm/remove_if.hpp \ - deps/range-v3/include/range/v3/algorithm/find_if.hpp \ - deps/range-v3/include/range/v3/action/reverse.hpp \ - deps/range-v3/include/range/v3/algorithm/reverse.hpp \ - deps/range-v3/include/range/v3/action/shuffle.hpp \ - deps/range-v3/include/range/v3/algorithm/shuffle.hpp \ - deps/range-v3/include/range/v3/utility/random.hpp \ - deps/range-v3/include/range/v3/algorithm/copy.hpp \ - deps/range-v3/include/range/v3/utility/copy.hpp \ - deps/range-v3/include/range/v3/algorithm/generate.hpp \ - deps/range-v3/include/range/v3/action/slice.hpp \ - deps/range-v3/include/range/v3/view/interface.hpp \ - deps/range-v3/include/range/v3/action/sort.hpp \ - deps/range-v3/include/range/v3/algorithm/sort.hpp \ - deps/range-v3/include/range/v3/algorithm/heap_algorithm.hpp \ - deps/range-v3/include/range/v3/algorithm/move_backward.hpp \ - deps/range-v3/include/range/v3/algorithm/partial_sort.hpp \ - deps/range-v3/include/range/v3/action/split.hpp \ - deps/range-v3/include/range/v3/range/conversion.hpp \ - deps/range-v3/include/range/v3/view/split.hpp \ - deps/range-v3/include/range/v3/algorithm/mismatch.hpp \ - deps/range-v3/include/range/v3/iterator/default_sentinel.hpp \ - deps/range-v3/include/range/v3/view/all.hpp \ - deps/range-v3/include/range/v3/view/ref.hpp \ - deps/range-v3/include/range/v3/detail/satisfy_boost_range.hpp \ - deps/range-v3/include/range/v3/view/subrange.hpp \ - deps/range-v3/include/range/v3/iterator/unreachable_sentinel.hpp \ - deps/range-v3/include/range/v3/view/view.hpp \ - deps/range-v3/include/range/v3/view/single.hpp \ - deps/range-v3/include/range/v3/utility/optional.hpp \ - deps/range-v3/include/range/v3/view/facade.hpp \ - deps/range-v3/include/range/v3/action/split_when.hpp \ - deps/range-v3/include/range/v3/view/split_when.hpp \ - deps/range-v3/include/range/v3/view/indirect.hpp \ - deps/range-v3/include/range/v3/view/adaptor.hpp \ - deps/range-v3/include/range/v3/utility/compressed_pair.hpp \ - deps/range-v3/include/range/v3/view/iota.hpp \ - deps/range-v3/include/range/v3/iterator/diffmax_t.hpp \ - deps/range-v3/include/range/v3/view/delimit.hpp \ - deps/range-v3/include/range/v3/view/take_while.hpp \ - deps/range-v3/include/range/v3/functional/indirect.hpp \ - deps/range-v3/include/range/v3/action/stable_sort.hpp \ - deps/range-v3/include/range/v3/algorithm/stable_sort.hpp \ - deps/range-v3/include/range/v3/algorithm/inplace_merge.hpp \ - deps/range-v3/include/range/v3/algorithm/lower_bound.hpp \ - deps/range-v3/include/range/v3/algorithm/aux_/lower_bound_n.hpp \ - deps/range-v3/include/range/v3/algorithm/aux_/partition_point_n.hpp \ - deps/range-v3/include/range/v3/algorithm/partition_point.hpp \ - deps/range-v3/include/range/v3/algorithm/merge.hpp \ - deps/range-v3/include/range/v3/algorithm/min.hpp \ - deps/range-v3/include/range/v3/algorithm/rotate.hpp \ - deps/range-v3/include/range/v3/algorithm/swap_ranges.hpp \ - deps/range-v3/include/range/v3/algorithm/upper_bound.hpp \ - deps/range-v3/include/range/v3/algorithm/aux_/upper_bound_n.hpp \ - deps/range-v3/include/range/v3/functional/not_fn.hpp \ - deps/range-v3/include/range/v3/iterator/move_iterators.hpp \ - deps/range-v3/include/range/v3/utility/memory.hpp \ - deps/range-v3/include/range/v3/utility/polymorphic_cast.hpp \ - deps/range-v3/include/range/v3/action/stride.hpp \ - deps/range-v3/include/range/v3/action/take.hpp \ - deps/range-v3/include/range/v3/action/take_while.hpp \ - deps/range-v3/include/range/v3/action/transform.hpp \ - deps/range-v3/include/range/v3/algorithm/transform.hpp \ - deps/range-v3/include/range/v3/action/unique.hpp \ - deps/range-v3/include/range/v3/algorithm/unique.hpp \ - deps/range-v3/include/range/v3/action/unstable_remove_if.hpp \ - deps/range-v3/include/range/v3/algorithm/unstable_remove_if.hpp \ - deps/range-v3/include/range/v3/algorithm.hpp \ - deps/range-v3/include/range/v3/algorithm/all_of.hpp \ - deps/range-v3/include/range/v3/algorithm/any_of.hpp \ - deps/range-v3/include/range/v3/algorithm/binary_search.hpp \ - deps/range-v3/include/range/v3/algorithm/contains.hpp \ - deps/range-v3/include/range/v3/algorithm/find.hpp \ - deps/range-v3/include/range/v3/algorithm/copy_backward.hpp \ - deps/range-v3/include/range/v3/algorithm/copy_if.hpp \ - deps/range-v3/include/range/v3/algorithm/copy_n.hpp \ - deps/range-v3/include/range/v3/algorithm/count.hpp \ - deps/range-v3/include/range/v3/algorithm/count_if.hpp \ - deps/range-v3/include/range/v3/algorithm/ends_with.hpp \ - deps/range-v3/include/range/v3/algorithm/equal.hpp \ - deps/range-v3/include/range/v3/algorithm/equal_range.hpp \ - deps/range-v3/include/range/v3/algorithm/aux_/equal_range_n.hpp \ - deps/range-v3/include/range/v3/algorithm/fill.hpp \ - deps/range-v3/include/range/v3/algorithm/fill_n.hpp \ - deps/range-v3/include/range/v3/algorithm/find_end.hpp \ - deps/range-v3/include/range/v3/algorithm/find_first_of.hpp \ - deps/range-v3/include/range/v3/algorithm/fold.hpp \ - deps/range-v3/include/range/v3/algorithm/fold_left.hpp \ - deps/range-v3/include/range/v3/algorithm/fold_right.hpp \ - deps/range-v3/include/range/v3/algorithm/for_each.hpp \ - deps/range-v3/include/range/v3/algorithm/for_each_n.hpp \ - deps/range-v3/include/range/v3/algorithm/generate_n.hpp \ - deps/range-v3/include/range/v3/algorithm/is_partitioned.hpp \ - deps/range-v3/include/range/v3/algorithm/is_sorted.hpp \ - deps/range-v3/include/range/v3/algorithm/is_sorted_until.hpp \ - deps/range-v3/include/range/v3/algorithm/lexicographical_compare.hpp \ - deps/range-v3/include/range/v3/algorithm/max_element.hpp \ - deps/range-v3/include/range/v3/algorithm/min_element.hpp \ - deps/range-v3/include/range/v3/algorithm/minmax.hpp \ - deps/range-v3/include/range/v3/algorithm/minmax_element.hpp \ - deps/range-v3/include/range/v3/algorithm/none_of.hpp \ - deps/range-v3/include/range/v3/algorithm/nth_element.hpp \ - deps/range-v3/include/range/v3/algorithm/partial_sort_copy.hpp \ - deps/range-v3/include/range/v3/algorithm/partition.hpp \ - deps/range-v3/include/range/v3/algorithm/partition_copy.hpp \ - deps/range-v3/include/range/v3/algorithm/permutation.hpp \ - deps/range-v3/include/range/v3/algorithm/remove.hpp \ - deps/range-v3/include/range/v3/algorithm/remove_copy.hpp \ - deps/range-v3/include/range/v3/algorithm/remove_copy_if.hpp \ - deps/range-v3/include/range/v3/algorithm/replace.hpp \ - deps/range-v3/include/range/v3/algorithm/replace_copy.hpp \ - deps/range-v3/include/range/v3/algorithm/replace_copy_if.hpp \ - deps/range-v3/include/range/v3/algorithm/replace_if.hpp \ - deps/range-v3/include/range/v3/algorithm/reverse_copy.hpp \ - deps/range-v3/include/range/v3/algorithm/rotate_copy.hpp \ - deps/range-v3/include/range/v3/algorithm/sample.hpp \ - deps/range-v3/include/range/v3/algorithm/search.hpp \ - deps/range-v3/include/range/v3/algorithm/search_n.hpp \ - deps/range-v3/include/range/v3/algorithm/set_algorithm.hpp \ - deps/range-v3/include/range/v3/algorithm/stable_partition.hpp \ - deps/range-v3/include/range/v3/algorithm/starts_with.hpp \ - deps/range-v3/include/range/v3/algorithm/unique_copy.hpp \ - deps/range-v3/include/range/v3/algorithm/aux_/merge_n.hpp \ - deps/range-v3/include/range/v3/algorithm/aux_/merge_n_with_buffer.hpp \ - deps/range-v3/include/range/v3/algorithm/aux_/sort_n_with_buffer.hpp \ - deps/range-v3/include/range/v3/core.hpp \ - deps/range-v3/include/range/v3/range/operations.hpp \ - deps/range-v3/include/range/v3/range_for.hpp \ - deps/range-v3/include/range/v3/view/getlines.hpp \ - deps/range-v3/include/range/v3/view/istream.hpp \ - deps/range-v3/include/range/v3/functional.hpp \ - deps/range-v3/include/range/v3/functional/arithmetic.hpp \ - deps/range-v3/include/range/v3/functional/on.hpp \ - deps/range-v3/include/range/v3/functional/overload.hpp \ - deps/range-v3/include/range/v3/iterator.hpp \ - deps/range-v3/include/range/v3/iterator/counted_iterator.hpp \ - deps/range-v3/include/range/v3/iterator/insert_iterators.hpp \ - deps/range-v3/include/range/v3/iterator/stream_iterators.hpp \ - deps/range-v3/include/range/v3/numeric.hpp \ - deps/range-v3/include/range/v3/numeric/accumulate.hpp \ - deps/range-v3/include/range/v3/numeric/adjacent_difference.hpp \ - deps/range-v3/include/range/v3/numeric/inner_product.hpp \ - deps/range-v3/include/range/v3/numeric/iota.hpp \ - deps/range-v3/include/range/v3/numeric/partial_sum.hpp \ - deps/range-v3/include/range/v3/range.hpp \ - deps/range-v3/include/range/v3/utility.hpp \ - deps/range-v3/include/range/v3/view.hpp \ - deps/range-v3/include/range/v3/view/addressof.hpp \ - deps/range-v3/include/range/v3/view/transform.hpp \ - deps/range-v3/include/range/v3/view/adjacent_filter.hpp \ - deps/range-v3/include/range/v3/view/adjacent_remove_if.hpp \ - deps/range-v3/include/range/v3/view/any_view.hpp \ - deps/range-v3/include/range/v3/view/c_str.hpp \ - deps/range-v3/include/range/v3/view/cache1.hpp \ - deps/range-v3/include/range/v3/view/cartesian_product.hpp \ - deps/range-v3/include/range/v3/view/empty.hpp \ - deps/range-v3/include/range/v3/view/chunk.hpp \ - deps/range-v3/include/range/v3/view/take.hpp \ - deps/range-v3/include/range/v3/view/chunk_by.hpp \ - deps/range-v3/include/range/v3/view/common.hpp \ - deps/range-v3/include/range/v3/view/concat.hpp \ - deps/range-v3/include/range/v3/utility/variant.hpp \ - deps/range-v3/include/range/v3/view/const.hpp \ - deps/range-v3/include/range/v3/view/counted.hpp \ - deps/range-v3/include/range/v3/view/cycle.hpp \ - deps/range-v3/include/range/v3/view/drop.hpp \ - deps/range-v3/include/range/v3/view/drop_exactly.hpp \ - deps/range-v3/include/range/v3/view/drop_last.hpp \ - deps/range-v3/include/range/v3/view/drop_while.hpp \ - deps/range-v3/include/range/v3/view/enumerate.hpp \ - deps/range-v3/include/range/v3/view/zip.hpp \ - deps/range-v3/include/range/v3/view/zip_with.hpp \ - deps/range-v3/include/range/v3/view/exclusive_scan.hpp \ - deps/range-v3/include/range/v3/view/filter.hpp \ - deps/range-v3/include/range/v3/view/remove_if.hpp \ - deps/range-v3/include/range/v3/view/for_each.hpp \ - deps/range-v3/include/range/v3/view/generate_n.hpp \ - deps/range-v3/include/range/v3/view/generate.hpp \ - deps/range-v3/include/range/v3/view/join.hpp \ - deps/range-v3/include/range/v3/view/repeat_n.hpp \ - deps/range-v3/include/range/v3/view/group_by.hpp \ - deps/range-v3/include/range/v3/view/indices.hpp \ - deps/range-v3/include/range/v3/view/intersperse.hpp \ - deps/range-v3/include/range/v3/view/linear_distribute.hpp \ - deps/range-v3/include/range/v3/view/map.hpp \ - deps/range-v3/include/range/v3/view/move.hpp \ - deps/range-v3/include/range/v3/view/partial_sum.hpp \ - deps/range-v3/include/range/v3/view/remove.hpp \ - deps/range-v3/include/range/v3/view/repeat.hpp \ - deps/range-v3/include/range/v3/view/replace.hpp \ - deps/range-v3/include/range/v3/view/replace_if.hpp \ - deps/range-v3/include/range/v3/view/reverse.hpp \ - deps/range-v3/include/range/v3/view/sample.hpp \ - deps/range-v3/include/range/v3/view/set_algorithm.hpp \ - deps/range-v3/include/range/v3/view/slice.hpp \ - deps/range-v3/include/range/v3/view/sliding.hpp \ - deps/range-v3/include/range/v3/view/span.hpp \ - deps/range-v3/include/range/v3/view/stride.hpp \ - deps/range-v3/include/range/v3/view/tail.hpp \ - deps/range-v3/include/range/v3/view/take_exactly.hpp \ - deps/range-v3/include/range/v3/view/take_last.hpp \ - deps/range-v3/include/range/v3/view/tokenize.hpp \ - deps/range-v3/include/range/v3/view/trim.hpp \ - deps/range-v3/include/range/v3/view/unbounded.hpp \ - deps/range-v3/include/range/v3/view/unique.hpp plugin.hh xmpp/stanza.hh \ +.omemo.o: omemo.cpp deps/fmt/include/fmt/core.h plugin.hh xmpp/stanza.hh \ account.hh pgp.hh omemo.hh /usr/include/signal/signal_protocol.h \ /usr/include/signal/ratchet.h \ /usr/include/signal/signal_protocol_types.h /usr/include/signal/curve.h \ @@ -854,279 +581,6 @@ message.hh: config/option.hh channel.hh connection.hh xmpp/ns.hh strophe.hh user.hh \ gcrypt.hh util.hh deps/fmt/include/fmt/core.h: -deps/range-v3/include/range/v3/all.hpp: -deps/range-v3/include/range/v3/action.hpp: -deps/range-v3/include/range/v3/action/action.hpp: -deps/range-v3/include/meta/meta.hpp: -deps/range-v3/include/meta/meta_fwd.hpp: -deps/range-v3/include/range/v3/range_fwd.hpp: -deps/range-v3/include/concepts/concepts.hpp: -deps/range-v3/include/concepts/swap.hpp: -deps/range-v3/include/concepts/type_traits.hpp: -deps/range-v3/include/concepts/compare.hpp: -deps/range-v3/include/range/v3/compare.hpp: -deps/range-v3/include/range/v3/detail/config.hpp: -deps/range-v3/include/range/v3/utility/static_const.hpp: -deps/range-v3/include/range/v3/version.hpp: -deps/range-v3/include/range/v3/detail/prologue.hpp: -deps/range-v3/include/range/v3/detail/epilogue.hpp: -deps/range-v3/include/range/v3/action/concepts.hpp: -deps/range-v3/include/range/v3/range/concepts.hpp: -deps/range-v3/include/range/v3/functional/comparisons.hpp: -deps/range-v3/include/range/v3/iterator/concepts.hpp: -deps/range-v3/include/range/v3/functional/concepts.hpp: -deps/range-v3/include/range/v3/functional/invoke.hpp: -deps/range-v3/include/range/v3/functional/identity.hpp: -deps/range-v3/include/range/v3/iterator/access.hpp: -deps/range-v3/include/std/detail/associated_types.hpp: -deps/range-v3/include/range/v3/utility/move.hpp: -deps/range-v3/include/range/v3/utility/swap.hpp: -deps/range-v3/include/range/v3/iterator/traits.hpp: -deps/range-v3/include/range/v3/utility/common_type.hpp: -deps/range-v3/include/range/v3/range/access.hpp: -deps/range-v3/include/range/v3/iterator/reverse_iterator.hpp: -deps/range-v3/include/range/v3/iterator/basic_iterator.hpp: -deps/range-v3/include/range/v3/detail/range_access.hpp: -deps/range-v3/include/range/v3/utility/addressof.hpp: -deps/range-v3/include/range/v3/utility/box.hpp: -deps/range-v3/include/range/v3/utility/get.hpp: -deps/range-v3/include/range/v3/detail/adl_get.hpp: -deps/range-v3/include/range/v3/utility/semiregular_box.hpp: -deps/range-v3/include/range/v3/functional/reference_wrapper.hpp: -deps/range-v3/include/range/v3/utility/in_place.hpp: -deps/range-v3/include/range/v3/range/primitives.hpp: -deps/range-v3/include/range/v3/range/traits.hpp: -deps/range-v3/include/range/v3/functional/compose.hpp: -deps/range-v3/include/range/v3/functional/pipeable.hpp: -deps/range-v3/include/range/v3/action/adjacent_remove_if.hpp: -deps/range-v3/include/range/v3/action/erase.hpp: -deps/range-v3/include/range/v3/action/insert.hpp: -deps/range-v3/include/range/v3/algorithm/max.hpp: -deps/range-v3/include/range/v3/iterator/common_iterator.hpp: -deps/range-v3/include/range/v3/detail/variant.hpp: -deps/range-v3/include/range/v3/utility/common_tuple.hpp: -deps/range-v3/include/range/v3/functional/bind.hpp: -deps/range-v3/include/range/v3/utility/tuple_algorithm.hpp: -deps/range-v3/include/range/v3/algorithm/adjacent_remove_if.hpp: -deps/range-v3/include/range/v3/algorithm/adjacent_find.hpp: -deps/range-v3/include/range/v3/range/dangling.hpp: -deps/range-v3/include/range/v3/algorithm/move.hpp: -deps/range-v3/include/range/v3/algorithm/result_types.hpp: -deps/range-v3/include/range/v3/functional/bind_back.hpp: -deps/range-v3/include/range/v3/action/drop.hpp: -deps/range-v3/include/range/v3/iterator/operations.hpp: -deps/range-v3/include/range/v3/action/drop_while.hpp: -deps/range-v3/include/range/v3/algorithm/find_if_not.hpp: -deps/range-v3/include/range/v3/action/join.hpp: -deps/range-v3/include/range/v3/action/push_back.hpp: -deps/range-v3/include/range/v3/detail/with_braced_init_args.hpp: -deps/range-v3/include/range/v3/action/push_front.hpp: -deps/range-v3/include/range/v3/action/remove_if.hpp: -deps/range-v3/include/range/v3/algorithm/remove_if.hpp: -deps/range-v3/include/range/v3/algorithm/find_if.hpp: -deps/range-v3/include/range/v3/action/reverse.hpp: -deps/range-v3/include/range/v3/algorithm/reverse.hpp: -deps/range-v3/include/range/v3/action/shuffle.hpp: -deps/range-v3/include/range/v3/algorithm/shuffle.hpp: -deps/range-v3/include/range/v3/utility/random.hpp: -deps/range-v3/include/range/v3/algorithm/copy.hpp: -deps/range-v3/include/range/v3/utility/copy.hpp: -deps/range-v3/include/range/v3/algorithm/generate.hpp: -deps/range-v3/include/range/v3/action/slice.hpp: -deps/range-v3/include/range/v3/view/interface.hpp: -deps/range-v3/include/range/v3/action/sort.hpp: -deps/range-v3/include/range/v3/algorithm/sort.hpp: -deps/range-v3/include/range/v3/algorithm/heap_algorithm.hpp: -deps/range-v3/include/range/v3/algorithm/move_backward.hpp: -deps/range-v3/include/range/v3/algorithm/partial_sort.hpp: -deps/range-v3/include/range/v3/action/split.hpp: -deps/range-v3/include/range/v3/range/conversion.hpp: -deps/range-v3/include/range/v3/view/split.hpp: -deps/range-v3/include/range/v3/algorithm/mismatch.hpp: -deps/range-v3/include/range/v3/iterator/default_sentinel.hpp: -deps/range-v3/include/range/v3/view/all.hpp: -deps/range-v3/include/range/v3/view/ref.hpp: -deps/range-v3/include/range/v3/detail/satisfy_boost_range.hpp: -deps/range-v3/include/range/v3/view/subrange.hpp: -deps/range-v3/include/range/v3/iterator/unreachable_sentinel.hpp: -deps/range-v3/include/range/v3/view/view.hpp: -deps/range-v3/include/range/v3/view/single.hpp: -deps/range-v3/include/range/v3/utility/optional.hpp: -deps/range-v3/include/range/v3/view/facade.hpp: -deps/range-v3/include/range/v3/action/split_when.hpp: -deps/range-v3/include/range/v3/view/split_when.hpp: -deps/range-v3/include/range/v3/view/indirect.hpp: -deps/range-v3/include/range/v3/view/adaptor.hpp: -deps/range-v3/include/range/v3/utility/compressed_pair.hpp: -deps/range-v3/include/range/v3/view/iota.hpp: -deps/range-v3/include/range/v3/iterator/diffmax_t.hpp: -deps/range-v3/include/range/v3/view/delimit.hpp: -deps/range-v3/include/range/v3/view/take_while.hpp: -deps/range-v3/include/range/v3/functional/indirect.hpp: -deps/range-v3/include/range/v3/action/stable_sort.hpp: -deps/range-v3/include/range/v3/algorithm/stable_sort.hpp: -deps/range-v3/include/range/v3/algorithm/inplace_merge.hpp: -deps/range-v3/include/range/v3/algorithm/lower_bound.hpp: -deps/range-v3/include/range/v3/algorithm/aux_/lower_bound_n.hpp: -deps/range-v3/include/range/v3/algorithm/aux_/partition_point_n.hpp: -deps/range-v3/include/range/v3/algorithm/partition_point.hpp: -deps/range-v3/include/range/v3/algorithm/merge.hpp: -deps/range-v3/include/range/v3/algorithm/min.hpp: -deps/range-v3/include/range/v3/algorithm/rotate.hpp: -deps/range-v3/include/range/v3/algorithm/swap_ranges.hpp: -deps/range-v3/include/range/v3/algorithm/upper_bound.hpp: -deps/range-v3/include/range/v3/algorithm/aux_/upper_bound_n.hpp: -deps/range-v3/include/range/v3/functional/not_fn.hpp: -deps/range-v3/include/range/v3/iterator/move_iterators.hpp: -deps/range-v3/include/range/v3/utility/memory.hpp: -deps/range-v3/include/range/v3/utility/polymorphic_cast.hpp: -deps/range-v3/include/range/v3/action/stride.hpp: -deps/range-v3/include/range/v3/action/take.hpp: -deps/range-v3/include/range/v3/action/take_while.hpp: -deps/range-v3/include/range/v3/action/transform.hpp: -deps/range-v3/include/range/v3/algorithm/transform.hpp: -deps/range-v3/include/range/v3/action/unique.hpp: -deps/range-v3/include/range/v3/algorithm/unique.hpp: -deps/range-v3/include/range/v3/action/unstable_remove_if.hpp: -deps/range-v3/include/range/v3/algorithm/unstable_remove_if.hpp: -deps/range-v3/include/range/v3/algorithm.hpp: -deps/range-v3/include/range/v3/algorithm/all_of.hpp: -deps/range-v3/include/range/v3/algorithm/any_of.hpp: -deps/range-v3/include/range/v3/algorithm/binary_search.hpp: -deps/range-v3/include/range/v3/algorithm/contains.hpp: -deps/range-v3/include/range/v3/algorithm/find.hpp: -deps/range-v3/include/range/v3/algorithm/copy_backward.hpp: -deps/range-v3/include/range/v3/algorithm/copy_if.hpp: -deps/range-v3/include/range/v3/algorithm/copy_n.hpp: -deps/range-v3/include/range/v3/algorithm/count.hpp: -deps/range-v3/include/range/v3/algorithm/count_if.hpp: -deps/range-v3/include/range/v3/algorithm/ends_with.hpp: -deps/range-v3/include/range/v3/algorithm/equal.hpp: -deps/range-v3/include/range/v3/algorithm/equal_range.hpp: -deps/range-v3/include/range/v3/algorithm/aux_/equal_range_n.hpp: -deps/range-v3/include/range/v3/algorithm/fill.hpp: -deps/range-v3/include/range/v3/algorithm/fill_n.hpp: -deps/range-v3/include/range/v3/algorithm/find_end.hpp: -deps/range-v3/include/range/v3/algorithm/find_first_of.hpp: -deps/range-v3/include/range/v3/algorithm/fold.hpp: -deps/range-v3/include/range/v3/algorithm/fold_left.hpp: -deps/range-v3/include/range/v3/algorithm/fold_right.hpp: -deps/range-v3/include/range/v3/algorithm/for_each.hpp: -deps/range-v3/include/range/v3/algorithm/for_each_n.hpp: -deps/range-v3/include/range/v3/algorithm/generate_n.hpp: -deps/range-v3/include/range/v3/algorithm/is_partitioned.hpp: -deps/range-v3/include/range/v3/algorithm/is_sorted.hpp: -deps/range-v3/include/range/v3/algorithm/is_sorted_until.hpp: -deps/range-v3/include/range/v3/algorithm/lexicographical_compare.hpp: -deps/range-v3/include/range/v3/algorithm/max_element.hpp: -deps/range-v3/include/range/v3/algorithm/min_element.hpp: -deps/range-v3/include/range/v3/algorithm/minmax.hpp: -deps/range-v3/include/range/v3/algorithm/minmax_element.hpp: -deps/range-v3/include/range/v3/algorithm/none_of.hpp: -deps/range-v3/include/range/v3/algorithm/nth_element.hpp: -deps/range-v3/include/range/v3/algorithm/partial_sort_copy.hpp: -deps/range-v3/include/range/v3/algorithm/partition.hpp: -deps/range-v3/include/range/v3/algorithm/partition_copy.hpp: -deps/range-v3/include/range/v3/algorithm/permutation.hpp: -deps/range-v3/include/range/v3/algorithm/remove.hpp: -deps/range-v3/include/range/v3/algorithm/remove_copy.hpp: -deps/range-v3/include/range/v3/algorithm/remove_copy_if.hpp: -deps/range-v3/include/range/v3/algorithm/replace.hpp: -deps/range-v3/include/range/v3/algorithm/replace_copy.hpp: -deps/range-v3/include/range/v3/algorithm/replace_copy_if.hpp: -deps/range-v3/include/range/v3/algorithm/replace_if.hpp: -deps/range-v3/include/range/v3/algorithm/reverse_copy.hpp: -deps/range-v3/include/range/v3/algorithm/rotate_copy.hpp: -deps/range-v3/include/range/v3/algorithm/sample.hpp: -deps/range-v3/include/range/v3/algorithm/search.hpp: -deps/range-v3/include/range/v3/algorithm/search_n.hpp: -deps/range-v3/include/range/v3/algorithm/set_algorithm.hpp: -deps/range-v3/include/range/v3/algorithm/stable_partition.hpp: -deps/range-v3/include/range/v3/algorithm/starts_with.hpp: -deps/range-v3/include/range/v3/algorithm/unique_copy.hpp: -deps/range-v3/include/range/v3/algorithm/aux_/merge_n.hpp: -deps/range-v3/include/range/v3/algorithm/aux_/merge_n_with_buffer.hpp: -deps/range-v3/include/range/v3/algorithm/aux_/sort_n_with_buffer.hpp: -deps/range-v3/include/range/v3/core.hpp: -deps/range-v3/include/range/v3/range/operations.hpp: -deps/range-v3/include/range/v3/range_for.hpp: -deps/range-v3/include/range/v3/view/getlines.hpp: -deps/range-v3/include/range/v3/view/istream.hpp: -deps/range-v3/include/range/v3/functional.hpp: -deps/range-v3/include/range/v3/functional/arithmetic.hpp: -deps/range-v3/include/range/v3/functional/on.hpp: -deps/range-v3/include/range/v3/functional/overload.hpp: -deps/range-v3/include/range/v3/iterator.hpp: -deps/range-v3/include/range/v3/iterator/counted_iterator.hpp: -deps/range-v3/include/range/v3/iterator/insert_iterators.hpp: -deps/range-v3/include/range/v3/iterator/stream_iterators.hpp: -deps/range-v3/include/range/v3/numeric.hpp: -deps/range-v3/include/range/v3/numeric/accumulate.hpp: -deps/range-v3/include/range/v3/numeric/adjacent_difference.hpp: -deps/range-v3/include/range/v3/numeric/inner_product.hpp: -deps/range-v3/include/range/v3/numeric/iota.hpp: -deps/range-v3/include/range/v3/numeric/partial_sum.hpp: -deps/range-v3/include/range/v3/range.hpp: -deps/range-v3/include/range/v3/utility.hpp: -deps/range-v3/include/range/v3/view.hpp: -deps/range-v3/include/range/v3/view/addressof.hpp: -deps/range-v3/include/range/v3/view/transform.hpp: -deps/range-v3/include/range/v3/view/adjacent_filter.hpp: -deps/range-v3/include/range/v3/view/adjacent_remove_if.hpp: -deps/range-v3/include/range/v3/view/any_view.hpp: -deps/range-v3/include/range/v3/view/c_str.hpp: -deps/range-v3/include/range/v3/view/cache1.hpp: -deps/range-v3/include/range/v3/view/cartesian_product.hpp: -deps/range-v3/include/range/v3/view/empty.hpp: -deps/range-v3/include/range/v3/view/chunk.hpp: -deps/range-v3/include/range/v3/view/take.hpp: -deps/range-v3/include/range/v3/view/chunk_by.hpp: -deps/range-v3/include/range/v3/view/common.hpp: -deps/range-v3/include/range/v3/view/concat.hpp: -deps/range-v3/include/range/v3/utility/variant.hpp: -deps/range-v3/include/range/v3/view/const.hpp: -deps/range-v3/include/range/v3/view/counted.hpp: -deps/range-v3/include/range/v3/view/cycle.hpp: -deps/range-v3/include/range/v3/view/drop.hpp: -deps/range-v3/include/range/v3/view/drop_exactly.hpp: -deps/range-v3/include/range/v3/view/drop_last.hpp: -deps/range-v3/include/range/v3/view/drop_while.hpp: -deps/range-v3/include/range/v3/view/enumerate.hpp: -deps/range-v3/include/range/v3/view/zip.hpp: -deps/range-v3/include/range/v3/view/zip_with.hpp: -deps/range-v3/include/range/v3/view/exclusive_scan.hpp: -deps/range-v3/include/range/v3/view/filter.hpp: -deps/range-v3/include/range/v3/view/remove_if.hpp: -deps/range-v3/include/range/v3/view/for_each.hpp: -deps/range-v3/include/range/v3/view/generate_n.hpp: -deps/range-v3/include/range/v3/view/generate.hpp: -deps/range-v3/include/range/v3/view/join.hpp: -deps/range-v3/include/range/v3/view/repeat_n.hpp: -deps/range-v3/include/range/v3/view/group_by.hpp: -deps/range-v3/include/range/v3/view/indices.hpp: -deps/range-v3/include/range/v3/view/intersperse.hpp: -deps/range-v3/include/range/v3/view/linear_distribute.hpp: -deps/range-v3/include/range/v3/view/map.hpp: -deps/range-v3/include/range/v3/view/move.hpp: -deps/range-v3/include/range/v3/view/partial_sum.hpp: -deps/range-v3/include/range/v3/view/remove.hpp: -deps/range-v3/include/range/v3/view/repeat.hpp: -deps/range-v3/include/range/v3/view/replace.hpp: -deps/range-v3/include/range/v3/view/replace_if.hpp: -deps/range-v3/include/range/v3/view/reverse.hpp: -deps/range-v3/include/range/v3/view/sample.hpp: -deps/range-v3/include/range/v3/view/set_algorithm.hpp: -deps/range-v3/include/range/v3/view/slice.hpp: -deps/range-v3/include/range/v3/view/sliding.hpp: -deps/range-v3/include/range/v3/view/span.hpp: -deps/range-v3/include/range/v3/view/stride.hpp: -deps/range-v3/include/range/v3/view/tail.hpp: -deps/range-v3/include/range/v3/view/take_exactly.hpp: -deps/range-v3/include/range/v3/view/take_last.hpp: -deps/range-v3/include/range/v3/view/tokenize.hpp: -deps/range-v3/include/range/v3/view/trim.hpp: -deps/range-v3/include/range/v3/view/unbounded.hpp: -deps/range-v3/include/range/v3/view/unique.hpp: plugin.hh: xmpp/stanza.hh: account.hh: diff --git a/.gitmodules b/.gitmodules index ddcf4b9..537eb1e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "diff"] path = deps/diff url = https://github.com/kristapsdz/libdiff -[submodule "deps/range-v3"] - path = deps/range-v3 - url = https://github.com/ericniebler/range-v3 diff --git a/deps/range-v3 b/deps/range-v3 deleted file mode 160000 index d800a03..0000000 --- a/deps/range-v3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d800a032132512a54c291ce55a2a43e0460591c7 diff --git a/makefile b/makefile index 3a6a858..4ff9690 100644 --- a/makefile +++ b/makefile @@ -6,7 +6,7 @@ endif RM ?= rm -f FIND ?= find -INCLUDES=-Ilibstrophe -Ideps -Ideps/optional/include -Ideps/range-v3/include -Ideps/fmt/include \ +INCLUDES=-Ilibstrophe -Ideps -Ideps/optional/include -Ideps/fmt/include \ $(shell xml2-config --cflags) \ $(shell pkg-config --cflags gpgme) \ $(shell pkg-config --cflags libsignal-protocol-c) diff --git a/omemo.cpp b/omemo.cpp index f3c7d98..9916115 100644 --- a/omemo.cpp +++ b/omemo.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -1613,9 +1613,9 @@ int dls_load_devicelist(signal_int_list **devicelist, const char *jid, t_omemo * omemo->dbi.omemo.get(transaction, k_devicelist, v_devicelist); auto devices = v_devicelist - | ranges::views::split(';') - | ranges::views::transform([](auto&& str) { - return std::stoul(std::string(&*str.begin(), ranges::distance(str))); + | std::ranges::views::split(';') + | std::ranges::views::transform([](auto&& str) { + return std::stoul(std::string(&*str.begin(), std::ranges::distance(str))); }); *devicelist = signal_int_list_alloc(); @@ -1717,9 +1717,9 @@ std::optional bks_load_bundle(struct signal_protocol_ omemo->dbi.omemo.get(transaction, k_bundle_ik, v_bundle_ik); auto r_bundle_pks = v_bundle_pk - | ranges::views::split(';') - | ranges::views::transform([](auto&& str) { - return std::string_view(&*str.begin(), ranges::distance(str)); + | std::ranges::views::split(';') + | std::ranges::views::transform([](auto&& str) { + return std::string_view(&*str.begin(), std::ranges::distance(str)); }); auto bundle_pks = std::vector{r_bundle_pks.begin(), r_bundle_pks.begin()}; if (bundle_pks.size() > 0) @@ -1738,9 +1738,9 @@ std::optional bks_load_bundle(struct signal_protocol_ libsignal::public_key pre_key(key_buf, key_len, omemo->context); auto r_bundle_sks = v_bundle_sk - | ranges::views::split(';') - | ranges::views::transform([](auto&& str) { - return std::string_view(&*str.begin(), ranges::distance(str)); + | std::ranges::views::split(';') + | std::ranges::views::transform([](auto&& str) { + return std::string_view(&*str.begin(), std::ranges::distance(str)); }); auto bundle_sks = std::vector{r_bundle_sks.begin(), r_bundle_sks.begin()}; if (bundle_sks.size() > 0)