Skip to content

Commit 1bb6e6b

Browse files
Fix nodiscard and constexpr
1 parent 816ca9a commit 1bb6e6b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

include/etl/span.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ namespace etl
408408
/// Reinterpret the span as a span with different element type.
409409
//*************************************************************************
410410
template<typename TNew>
411-
ETL_NODISCARD ETL_CONSTEXPR etl::span<TNew, etl::dynamic_extent> reinterpret_as() const
411+
ETL_NODISCARD ETL_CONSTEXPR14 etl::span<TNew, etl::dynamic_extent> reinterpret_as() const
412412
{
413413
#if ETL_USING_CPP11
414414
ETL_ASSERT(etl::is_aligned<alignof(TNew)>(pbegin), ETL_ERROR(span_alignment_exception));
@@ -752,7 +752,7 @@ namespace etl
752752
/// Reinterpret the span as a span with different element type.
753753
//*************************************************************************
754754
template<typename TNew>
755-
ETL_NODISCARD ETL_CONSTEXPR etl::span<TNew, etl::dynamic_extent> reinterpret_as() const
755+
ETL_NODISCARD ETL_CONSTEXPR14 etl::span<TNew, etl::dynamic_extent> reinterpret_as() const
756756
{
757757
#if ETL_USING_CPP11
758758
ETL_ASSERT(etl::is_aligned<alignof(TNew)>(pbegin), ETL_ERROR(span_alignment_exception));

test/test_span_dynamic_extent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@ namespace
12711271
etl::span<uint16_t> data2 = data1.subspan(2).reinterpret_as<uint16_t>();
12721272
CHECK_EQUAL(data2.size(), 5);
12731273

1274-
CHECK_THROW(data1.subspan(1).reinterpret_as<uint16_t>(), etl::span_alignment_exception);
1274+
CHECK_THROW(data2 = data1.subspan(1).reinterpret_as<uint16_t>(), etl::span_alignment_exception);
12751275
}
12761276

12771277
//*************************************************************************

test/test_span_fixed_extent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ namespace
11501150
etl::span<uint16_t> data2 = data1.subspan(2).reinterpret_as<uint16_t>();
11511151
CHECK_EQUAL(data2.size(), 5);
11521152

1153-
CHECK_THROW(data1.subspan(1).reinterpret_as<uint16_t>(), etl::span_alignment_exception);
1153+
CHECK_THROW(data2 = data1.subspan(1).reinterpret_as<uint16_t>(), etl::span_alignment_exception);
11541154
}
11551155

11561156
//*************************************************************************

0 commit comments

Comments
 (0)