Skip to content

Commit 8d352bb

Browse files
committed
Merge branch 'pull-request/#1007-Fix-fixed-extent-span-empty()' into development
# Conflicts: # .gitignore
2 parents 8f70a3c + de51170 commit 8d352bb

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

include/etl/span.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ namespace etl
272272
//*************************************************************************
273273
ETL_NODISCARD ETL_CONSTEXPR bool empty() const ETL_NOEXCEPT
274274
{
275-
return false;
275+
return Extent == 0;
276276
}
277277

278278
//*************************************************************************

test/test_span_fixed_extent.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ namespace
5252
typedef etl::span<int, 10U> View;
5353
typedef etl::span<int, 9U> SView;
5454
typedef etl::span<const int, 10U> CView;
55+
typedef etl::span<int, 0U> EView;
5556

5657
#if ETL_USING_CPP20
5758
using StdView = std::span<int, 10U>;
@@ -484,6 +485,9 @@ namespace
484485
{
485486
View view1(etldata.begin(), etldata.begin());
486487
CHECK(!view1.empty());
488+
489+
EView view2(etldata.begin(), etldata.begin());
490+
CHECK(view2.empty());
487491
}
488492

489493
//*************************************************************************

0 commit comments

Comments
 (0)