commit 0b6c561830bd222f84aa55fa806ac65b767b9542
author Davide Pesavento <davidepesa@gmail.com> Sun Feb 04 15:08:47 2024 -0500
committer Davide Pesavento <davidepesa@gmail.com> Sun Feb 04 15:08:47 2024 -0500
tree 1a3896e57ad6a5aca4b3e8b909f44f07a01fd166
parent 1326051ef9542eb11be6007ec489993b02ab9f58

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

scope-lite commit 89b274a106363101ea258cb9555a9c6a47ae2928
span-lite commit 50f55c59d1b66910837313c40d11328d03447a41

Change-Id: I9c7ca2d4ee159a8102e1b701075cd863342ed91a

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

diff --git a/ndn-cxx/detail/nonstd/scope-lite.hpp b/ndn-cxx/detail/nonstd/scope-lite.hpp
index 0badcb9..518ae8c 100644
--- a/ndn-cxx/detail/nonstd/scope-lite.hpp
+++ b/ndn-cxx/detail/nonstd/scope-lite.hpp
@@ -329,7 +329,7 @@
 # define scope_ENABLE_IF_R_(VA, R)  R
 #endif
 
-// Method enabling (funtion template argument):
+// Method enabling (function template argument):
 
 #if scope_HAVE( TYPE_TRAITS ) && scope_HAVE( DEFAULT_FUNCTION_TEMPLATE_ARG )
 // VS 2013 seems to have trouble with SFINAE for default non-type arguments:
@@ -498,7 +498,7 @@
     template< class T > struct reference_wrapper{ typedef T type; };
 #endif
 
-} // namepsace std11
+} // namespace std11
 
 // C++14 emulation:
 
@@ -574,7 +574,7 @@
 template< class T >
 struct type_identity { typedef T type; };
 
-} // namepsace std20
+} // namespace std20
 
 namespace detail {
 
@@ -827,7 +827,9 @@
         other.release();
     }
 
-    scope_constexpr_ext ~scope_success() scope_noexcept
+    scope_constexpr_ext ~scope_success() scope_noexcept_op(
+        scope_noexcept_op(this->exit_function())
+    )
     {
         if ( uncaught_on_creation >= detail::uncaught_exceptions() )
             exit_function();

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

diff --git a/ndn-cxx/detail/nonstd/span-lite.hpp b/ndn-cxx/detail/nonstd/span-lite.hpp
index a2d0c5d..3d2d86a 100644
--- a/ndn-cxx/detail/nonstd/span-lite.hpp
+++ b/ndn-cxx/detail/nonstd/span-lite.hpp
@@ -12,8 +12,8 @@
 #define NONSTD_SPAN_HPP_INCLUDED
 
 #define span_lite_MAJOR  0
-#define span_lite_MINOR  10
-#define span_lite_PATCH  3
+#define span_lite_MINOR  11
+#define span_lite_PATCH  0
 
 #define span_lite_VERSION  span_STRINGIFY(span_lite_MAJOR) "." span_STRINGIFY(span_lite_MINOR) "." span_STRINGIFY(span_lite_PATCH)
 
@@ -228,6 +228,7 @@
 namespace nonstd {
 
 using std::span;
+using std::dynamic_extent;
 
 // Note: C++20 does not provide comparison
 // using std::operator==;
@@ -345,6 +346,7 @@
 #define span_HAVE_IS_DEFAULT                span_CPP11_140
 #define span_HAVE_IS_DELETE                 span_CPP11_140
 #define span_HAVE_NOEXCEPT                  span_CPP11_140
+#define span_HAVE_NORETURN                ( span_CPP11_140 && ! span_BETWEEN( span_COMPILER_GNUC_VERSION, 1, 480 ) )
 #define span_HAVE_NULLPTR                   span_CPP11_100
 #define span_HAVE_STATIC_ASSERT             span_CPP11_100
 
@@ -356,7 +358,6 @@
 
 #define span_HAVE_DEPRECATED                span_CPP17_000
 #define span_HAVE_NODISCARD                 span_CPP17_000
-#define span_HAVE_NORETURN                  span_CPP17_000
 
 // MSVC: template parameter deduction guides since Visual Studio 2017 v15.7