detail: update bundled copies of scope-lite and span-lite
martinmoene/scope-lite@4b5dbf4f58abeaff2d53794853f45eb837580b2b
martinmoene/span-lite@00afc281a8c3c7657bb9c5b000d6e7082c1bbc7f
Change-Id: I0e380effe14d5b99babc977e79f953016c01bfad
diff --git a/ndn-cxx/detail/nonstd/scope-lite.hpp b/ndn-cxx/detail/nonstd/scope-lite.hpp
index afd4f86..83ed338 100644
--- a/ndn-cxx/detail/nonstd/scope-lite.hpp
+++ b/ndn-cxx/detail/nonstd/scope-lite.hpp
@@ -897,7 +897,7 @@
);
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
index 3d2d86a..9a7182f 100644
--- a/ndn-cxx/detail/nonstd/span-lite.hpp
+++ b/ndn-cxx/detail/nonstd/span-lite.hpp
@@ -1870,7 +1870,7 @@
#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 @@
} // 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()