This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 4d9c97ad0f4e8fa6d22990a1da07040611b37536 Author: Leif Hedstrom <[email protected]> AuthorDate: Wed Jan 22 09:57:32 2025 -0700 Make LLVM19 builds happy again (#11977) (cherry picked from commit 8eaddba2c797b47187e887b5c01f74a335656b43) --- plugins/experimental/txn_box/plugin/include/txn_box/Context.h | 2 +- plugins/experimental/txn_box/plugin/include/txn_box/common.h | 6 +++--- plugins/experimental/txn_box/plugin/src/Machinery.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/experimental/txn_box/plugin/include/txn_box/Context.h b/plugins/experimental/txn_box/plugin/include/txn_box/Context.h index cf03cb766b..48c851fff7 100644 --- a/plugins/experimental/txn_box/plugin/include/txn_box/Context.h +++ b/plugins/experimental/txn_box/plugin/include/txn_box/Context.h @@ -793,7 +793,7 @@ Context::render_transient(F const &f) // create the writer and clean it up. Also, the outer is responsible for finalizing the // transient buffer used. if (!_transient_writer.has_value()) { - _transient_writer.template emplace(this->transient_buffer()); + _transient_writer.emplace(this->transient_buffer()); outer_p = true; } else { base = _transient_writer->extent(); diff --git a/plugins/experimental/txn_box/plugin/include/txn_box/common.h b/plugins/experimental/txn_box/plugin/include/txn_box/common.h index 166e2fba66..1bd279acb3 100644 --- a/plugins/experimental/txn_box/plugin/include/txn_box/common.h +++ b/plugins/experimental/txn_box/plugin/include/txn_box/common.h @@ -185,13 +185,13 @@ constexpr std::array<ValueType, FeatureTypeList::size> FeatureIndexToValue{ namespace detail { template <typename GENERATOR, size_t... IDX> -constexpr std::initializer_list<std::result_of_t<GENERATOR(size_t)>> +constexpr std::initializer_list<std::invoke_result_t<GENERATOR, size_t>> indexed_init_list(GENERATOR &&g, std::index_sequence<IDX...> &&) { return {g(IDX)...}; } template <size_t N, typename GENERATOR> -constexpr std::initializer_list<std::result_of_t<GENERATOR(size_t)>> +constexpr std::initializer_list<std::invoke_result_t<GENERATOR, size_t>> indexed_init_list(GENERATOR &&g) { return indexed_init_list(std::forward<GENERATOR>(g), std::make_index_sequence<N>()); @@ -204,7 +204,7 @@ indexed_array(GENERATOR &&g, std::index_sequence<IDX...> &&) return std::array<std::invoke_result_t<GENERATOR, size_t>, sizeof...(IDX)>{g(IDX)...}; } template <size_t N, typename GENERATOR> -constexpr std::array<std::result_of_t<GENERATOR(size_t)>, N> +constexpr std::array<std::invoke_result_t<GENERATOR, size_t>, N> indexed_array(GENERATOR &&g) { return indexed_array(std::forward<GENERATOR>(g), std::make_index_sequence<N>()); diff --git a/plugins/experimental/txn_box/plugin/src/Machinery.cc b/plugins/experimental/txn_box/plugin/src/Machinery.cc index 758173c499..2ff2f91293 100644 --- a/plugins/experimental/txn_box/plugin/src/Machinery.cc +++ b/plugins/experimental/txn_box/plugin/src/Machinery.cc @@ -1832,7 +1832,7 @@ protected: auto operator()(T &&t) -> EnableForFeatureTypes<T, void> { - this->assign(_ctx.template render_transient([&t](BufferWriter &w) { bwformat(w, bwf::Spec::DEFAULT, t); })); + this->assign(_ctx.render_transient([&t](BufferWriter &w) { bwformat(w, bwf::Spec::DEFAULT, t); })); this->clear_dups(); } };
