Skip to content

Commit 361e168

Browse files
committed
detail: update bundled copies of scope-lite and span-lite
nonstd-lite/scope-lite@4b5dbf4 nonstd-lite/span-lite@00afc28 Change-Id: I0e380effe14d5b99babc977e79f953016c01bfad
1 parent eb27ca2 commit 361e168

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ndn-cxx/detail/nonstd/scope-lite.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ class unique_resource
897897
);
898898

899899
scope_static_assert(
900-
(std11::is_move_constructible<R>::value && std11::is_nothrow_move_constructible<D>::value )
900+
(std11::is_move_constructible<D>::value && std11::is_nothrow_move_constructible<D>::value )
901901
|| std11::is_copy_constructible<D>::value
902902
, "deleter must be nothrow_move_constructible or copy_constructible"
903903
);

ndn-cxx/detail/nonstd/span-lite.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,7 +1870,7 @@ using span_lite::byte_span;
18701870

18711871
#endif // span_FEATURE( BYTE_SPAN )
18721872

1873-
#if span_HAVE( STRUCT_BINDING )
1873+
#if !span_USES_STD_SPAN && span_HAVE( STRUCT_BINDING )
18741874

18751875
#if span_CPP14_OR_GREATER
18761876
# include <tuple>
@@ -1938,7 +1938,7 @@ span_constexpr ElementType const & get( nonstd::span<ElementType, Extent> const
19381938

19391939
} // end namespace std
19401940

1941-
#endif // span_HAVE( STRUCT_BINDING )
1941+
#endif // !span_USES_STD_SPAN && span_HAVE( STRUCT_BINDING )
19421942

19431943
#if ! span_USES_STD_SPAN
19441944
span_RESTORE_WARNINGS()

0 commit comments

Comments
 (0)