detail: update bundled copies of scope-lite and span-lite

martinmoene/scope-lite@4b5dbf4 martinmoene/span-lite@00afc28 Change-Id: I0e380effe14d5b99babc977e79f953016c01bfad
named-data · Jun 18, 2024 · 361e168 · 361e168
1 parent eb27ca2
commit 361e168
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ndn-cxx/detail/nonstd/scope-lite.hpp b/ndn-cxx/detail/nonstd/scope-lite.hpp
@@ -897,7 +897,7 @@ class unique_resource
     );
 
     scope_static_assert(
-          (std11::is_move_constructible<R>::value && std11::is_nothrow_move_constructible<D>::value )
+          (std11::is_move_constructible<D>::value && std11::is_nothrow_move_constructible<D>::value )
         || std11::is_copy_constructible<D>::value
         , "deleter must be nothrow_move_constructible or copy_constructible"
     );

diff --git a/ndn-cxx/detail/nonstd/span-lite.hpp b/ndn-cxx/detail/nonstd/span-lite.hpp
@@ -1870,7 +1870,7 @@ using span_lite::byte_span;
 
 #endif // span_FEATURE( BYTE_SPAN )
 
-#if span_HAVE( STRUCT_BINDING )
+#if !span_USES_STD_SPAN && span_HAVE( STRUCT_BINDING )
 
 #if   span_CPP14_OR_GREATER
 # include <tuple>
@@ -1938,7 +1938,7 @@ span_constexpr ElementType const & get( nonstd::span<ElementType, Extent> const
 
 } // end namespace std
 
-#endif // span_HAVE( STRUCT_BINDING )
+#endif // !span_USES_STD_SPAN && span_HAVE( STRUCT_BINDING )
 
 #if ! span_USES_STD_SPAN
 span_RESTORE_WARNINGS()