fix: conflicts

kokkos · Oct 17, 2024 · 48947d1 · 48947d1
1 parent 682c6d3
commit 48947d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/common/unit_test/Test_Utils.cpp b/common/unit_test/Test_Utils.cpp
@@ -563,6 +563,7 @@ TEST(ToArray, lvalue) {
 
 TEST(ToArray, rvalue) {
   ASSERT_EQ(KokkosFFT::Impl::to_array(std::array{1, 2}), (Kokkos::Array{1, 2}));
+}
 
 template <typename ValueType1, typename ValueType2>
 void test_are_pointers_aliasing() {

diff --git a/fft/src/KokkosFFT_Host_plans.hpp b/fft/src/KokkosFFT_Host_plans.hpp
@@ -38,7 +38,7 @@ auto create_plan(const ExecutionSpace& exec_space,
                  std::unique_ptr<PlanType>& plan, const InViewType& in,
                  const OutViewType& out, BufferViewType&, InfoType&,
                  Direction direction, axis_type<fft_rank> axes,
-                 shape_type<fft_rank> s, bool is_in_place) {
+                 shape_type<fft_rank> s, bool is_inplace) {
   static_assert(
       KokkosFFT::Impl::are_operatable_views_v<ExecutionSpace, InViewType,
                                               OutViewType>,