Skip to content

Commit 8b871dd

Browse files
[arccore,base] Déplaces types du namespace 'Arcane::impl::detail' vers 'Arcane::impl'.
1 parent 5fc68bb commit 8b871dd

File tree

1 file changed

+15
-12
lines changed
  • arccore/src/base/arccore/base

1 file changed

+15
-12
lines changed

arccore/src/base/arccore/base/Span.h

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
/*---------------------------------------------------------------------------*/
2323
/*---------------------------------------------------------------------------*/
2424

25-
namespace Arcane
26-
{
27-
namespace detail
25+
namespace Arcane::impl
2826
{
2927
// Pour indiquer que Span<T>::view() retourne un ArrayView
3028
// et Span<const T>::view() retourne un ConstArrayView.
@@ -62,9 +60,14 @@ namespace detail
6260

6361
using SpanType = Span<T>;
6462
};
65-
6663
}
6764

65+
/*---------------------------------------------------------------------------*/
66+
/*---------------------------------------------------------------------------*/
67+
68+
namespace Arcane
69+
{
70+
6871
/*---------------------------------------------------------------------------*/
6972
/*---------------------------------------------------------------------------*/
7073
/*!
@@ -103,7 +106,7 @@ class SpanImpl
103106
using const_reference = const ElementType&;
104107
using iterator = ArrayIterator<pointer>;
105108
using const_iterator = ArrayIterator<const_pointer>;
106-
using view_type = typename detail::ViewTypeT<ElementType>::view_type;
109+
using view_type = typename impl::ViewTypeT<ElementType>::view_type;
107110
using reverse_iterator = std::reverse_iterator<iterator>;
108111
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
109112

@@ -877,7 +880,7 @@ sampleSpan(Span<const DataType> values,Span<const Int32> indexes,Span<DataType>
877880
* \brief Converti la vue en un tableau d'octets non modifiables.
878881
*/
879882
template <typename DataType, typename SizeType, SizeType Extent>
880-
inline typename detail::SpanTypeFromSize<const std::byte, SizeType>::SpanType
883+
inline typename impl::SpanTypeFromSize<const std::byte, SizeType>::SpanType
881884
asBytes(const SpanImpl<DataType,SizeType,Extent>& s)
882885
{
883886
return {reinterpret_cast<const std::byte*>(s.data()), s.sizeBytes()};
@@ -912,7 +915,7 @@ asBytes(const ConstArrayView<DataType>& s)
912915
*/
913916
template<typename DataType,typename SizeType,SizeType Extent,
914917
typename std::enable_if_t<!std::is_const<DataType>::value, int> = 0>
915-
inline typename detail::SpanTypeFromSize<std::byte, SizeType>::SpanType
918+
inline typename impl::SpanTypeFromSize<std::byte, SizeType>::SpanType
916919
asWritableBytes(const SpanImpl<DataType, SizeType, Extent>& s)
917920
{
918921
return {reinterpret_cast<std::byte*>(s.data()), s.sizeBytes()};
@@ -932,7 +935,7 @@ asWritableBytes(const ArrayView<DataType>& s)
932935
/*---------------------------------------------------------------------------*/
933936
/*---------------------------------------------------------------------------*/
934937

935-
namespace detail
938+
namespace impl
936939
{
937940

938941
template<typename ByteType, typename DataType,Int64 Extent> inline Span<DataType>
@@ -972,7 +975,7 @@ asSmallSpanInternal(SmallSpan<ByteType,Extent> bytes)
972975
template<typename DataType,Int64 Extent> inline Span<DataType>
973976
asSpan(Span<std::byte,Extent> bytes)
974977
{
975-
return detail::asSpanInternal<std::byte,DataType,Extent>(bytes);
978+
return impl::asSpanInternal<std::byte,DataType,Extent>(bytes);
976979
}
977980
/*!
978981
* \brief Converti un Span<std::byte> en un Span<DataType>.
@@ -981,7 +984,7 @@ asSpan(Span<std::byte,Extent> bytes)
981984
template<typename DataType,Int64 Extent> inline Span<const DataType>
982985
asSpan(Span<const std::byte,Extent> bytes)
983986
{
984-
return detail::asSpanInternal<const std::byte,const DataType,Extent>(bytes);
987+
return impl::asSpanInternal<const std::byte,const DataType,Extent>(bytes);
985988
}
986989
/*!
987990
* \brief Converti un SmallSpan<std::byte> en un SmallSpan<DataType>.
@@ -990,7 +993,7 @@ asSpan(Span<const std::byte,Extent> bytes)
990993
template<typename DataType,Int32 Extent> inline SmallSpan<DataType>
991994
asSmallSpan(SmallSpan<std::byte,Extent> bytes)
992995
{
993-
return detail::asSmallSpanInternal<std::byte,DataType,Extent>(bytes);
996+
return impl::asSmallSpanInternal<std::byte,DataType,Extent>(bytes);
994997
}
995998
/*!
996999
* \brief Converti un SmallSpan<const std::byte> en un SmallSpan<const DataType>.
@@ -999,7 +1002,7 @@ asSmallSpan(SmallSpan<std::byte,Extent> bytes)
9991002
template<typename DataType,Int32 Extent> inline SmallSpan<const DataType>
10001003
asSmallSpan(SmallSpan<const std::byte,Extent> bytes)
10011004
{
1002-
return detail::asSmallSpanInternal<const std::byte,const DataType,Extent>(bytes);
1005+
return impl::asSmallSpanInternal<const std::byte,const DataType,Extent>(bytes);
10031006
}
10041007

10051008
/*---------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)