diff --git a/arcane/src/arcane/tests/accelerator/AcceleratorViewsUnitTest.cc b/arcane/src/arcane/tests/accelerator/AcceleratorViewsUnitTest.cc index 62b7d9098..cdebd6c3a 100644 --- a/arcane/src/arcane/tests/accelerator/AcceleratorViewsUnitTest.cc +++ b/arcane/src/arcane/tests/accelerator/AcceleratorViewsUnitTest.cc @@ -889,7 +889,7 @@ _executeTestMultiArray() for (Int32 i = 0; i < dim1_size; ++i) sizes[i] = i + 1; values.resize(sizes); - MultiArray2SmallSpan inout_values = values.span(); + JaggedSmallSpan inout_values = values.span(); for (Int32 i = 0; i < dim1_size; ++i) { const Int32 dim2_size = inout_values[i].size(); Int32 total = 0; diff --git a/arcane/src/arcane/utils/MultiArray2.h b/arcane/src/arcane/utils/MultiArray2.h index 52749a9fd..7aeca7583 100644 --- a/arcane/src/arcane/utils/MultiArray2.h +++ b/arcane/src/arcane/utils/MultiArray2.h @@ -183,19 +183,19 @@ class MultiArray2 } //! Vue modifiable du tableau - MultiArray2SmallSpan span() + JaggedSmallSpan span() { return { m_buffer.smallSpan(), m_indexes, m_sizes }; } //! Vue constante du tableau - MultiArray2SmallSpan span() const + JaggedSmallSpan span() const { return { m_buffer, m_indexes, m_sizes }; } //! Vue constante du tableau - MultiArray2SmallSpan constSpan() const + JaggedSmallSpan constSpan() const { return { m_buffer.constSmallSpan(), m_indexes, m_sizes }; } diff --git a/arcane/src/arcane/utils/MultiArray2View.h b/arcane/src/arcane/utils/MultiArray2View.h index 1a8b049d2..7047bb6cc 100644 --- a/arcane/src/arcane/utils/MultiArray2View.h +++ b/arcane/src/arcane/utils/MultiArray2View.h @@ -140,7 +140,7 @@ class ConstMultiArray2View * ou MultiArray2::constSpan(). */ template -class MultiArray2SmallSpan +class JaggedSmallSpan { private: @@ -149,12 +149,12 @@ class MultiArray2SmallSpan public: //! Vue vide - MultiArray2SmallSpan() = default; + JaggedSmallSpan() = default; private: //! Vue sur la tableau \a buf - MultiArray2SmallSpan(SmallSpan buf, SmallSpan indexes, + JaggedSmallSpan(SmallSpan buf, SmallSpan indexes, SmallSpan sizes) : m_buffer(buf) , m_indexes(indexes)