Update yasio version

Author: halx99

3rdparty/README.md

@@ -263,7 +263,7 @@
 
 ## yasio
 - [![Upstream](https://img.shields.io/github/v/release/yasio/yasio?label=Upstream)](https://github.com/yasio/yasio)
-- Version: 4.3.2
+- Version: 4.4.0
 - License: MIT WITH Anti-996
 
 ## zlib

3rdparty/yasio/yasio/bindings/yasio_ni.cpp

@@ -32,7 +32,7 @@ SOFTWARE.
 #include <array>
 #include <string.h>
 #include "yasio/yasio.hpp"
-#include "yasio/split.hpp"
+#include "yasio/tlx/split.hpp"
 
 #if defined(_WINDLL)
 #  define YASIO_NI_API __declspec(dllexport)
@@ -46,8 +46,8 @@ using namespace yasio;
 
 namespace
 {
-inline int svtoi(cxx17::string_view& sv) { return !sv.empty() ? atoi(sv.data()) : 0; }
-inline const char* svtoa(cxx17::string_view& sv) { return !sv.empty() ? sv.data() : ""; }
+inline int svtoi(std::string_view& sv) { return !sv.empty() ? atoi(sv.data()) : 0; }
+inline const char* svtoa(std::string_view& sv) { return !sv.empty() ? sv.data() : ""; }
 } // namespace
 
 extern "C" {
@@ -60,12 +60,12 @@ YASIO_NI_API void yasio_init_globals(void(YASIO_INTEROP_DECL* pfn)(int level, co
 YASIO_NI_API void yasio_cleanup_globals() { io_service::cleanup_globals(); }
 
 struct yasio_io_event {
-  int kind; // event kind
-  int channel; // channel index
+  int kind;      // event kind
+  int channel;   // channel index
   void* thandle; // transport
   union {
     void* hmsg; // io_packet*
-    int ec; // error code
+    int ec;     // error code
   };
   void* user; // user data
 };
@@ -154,16 +154,19 @@ YASIO_NI_API void yasio_set_option(void* service_ptr, int opt, const char* pszAr
 
   // split args
   std::string strArgs = pszArgs;
-  std::array<cxx17::string_view, YASIO_MAX_OPTION_ARGC> args;
+  std::array<std::string_view, YASIO_MAX_OPTION_ARGC> args;
   int argc = 0;
-  tlx::split_if(&strArgs.front(), ';', [&](char* s, char* e) {
-    if (e) {
-        *e           = '\0'; // to c style string
-        args[argc++] = cxx17::string_view(s, e - s);
-    } else {
-        args[argc++] = cxx17::string_view{s};
+  tlx::split_until(&strArgs.front(), ';', [&](char* s, char* e) {
+    if (e)
+    {
+      *e           = '\0'; // to c style string
+      args[argc++] = std::string_view(s, e - s);
     }
-    return (argc < YASIO_MAX_OPTION_ARGC);
+    else
+    {
+      args[argc++] = std::string_view{s};
+    }
+    return (argc >= YASIO_MAX_OPTION_ARGC);
   });
 
   switch (opt)
@@ -233,7 +236,7 @@ YASIO_NI_API int yasio_write(void* service_ptr, void* thandle, const char* bytes
 {
   auto service = reinterpret_cast<io_service*>(service_ptr);
   if (service)
-    return service->write(reinterpret_cast<transport_handle_t>(thandle), yasio::sbyte_buffer(bytes, bytes + len));
+    return service->write(reinterpret_cast<transport_handle_t>(thandle), tlx::sbyte_buffer(bytes, bytes + len));
   return -1;
 }
 YASIO_NI_API int yasio_forward(void* service_ptr, void* thandle, void* bufferHandle,
@@ -324,6 +327,6 @@ YASIO_NI_API void yasio_ob_write_bytes(void* obs_ptr, void* bytes, int len)
   obs->write_bytes(bytes, len);
 }
 
-YASIO_NI_API long long yasio_highp_time(void) { return highp_clock<system_clock_t>(); }
-YASIO_NI_API long long yasio_highp_clock(void) { return highp_clock<steady_clock_t>(); }
+YASIO_NI_API long long yasio_highp_time(void) { return tlx::highp_clock<tlx::system_clock_t>(); }
+YASIO_NI_API long long yasio_highp_clock(void) { return tlx::highp_clock<tlx::steady_clock_t>(); }
 }

3rdparty/yasio/yasio/config.hpp

@@ -199,7 +199,7 @@ SOFTWARE.
 /*
 **  The yasio version macros
 */
-#define YASIO_VERSION_NUM 0x040302
+#define YASIO_VERSION_NUM 0x040400
 
 /*
 ** The macros used by io_service.

3rdparty/yasio/yasio/endian_portable.hpp

@@ -146,8 +146,8 @@ template <>
 struct byte_order_impl<fp16_t, sizeof(fp16_t)> {
   static inline fp16_t host_to_network(fp16_t value)
   {
-    uint16_t& underlying_value = (uint16_t&)value;
-    YASIO__SWAP_SHORT(underlying_value);
+    auto underlying_value = reinterpret_cast<uint16_t*>(&value);
+    YASIO__SWAP_SHORT(*underlying_value);
     return value;
   }
   static inline fp16_t network_to_host(fp16_t value) { return host_to_network(value); }

3rdparty/yasio/yasio/tlx/vector.hpp

@@ -53,7 +53,7 @@ namespace tlx
 {
 
 // Writable iterator for sequential containers
-template <class _Myvec>
+template <typename _Myvec>
 class sequence_const_iterator {
 public:
   using iterator_concept  = std::contiguous_iterator_tag;
@@ -146,7 +146,7 @@ class sequence_const_iterator {
   _Tptr _Ptr; // pointer to element in vector
 };
 
-template <class _Myvec>
+template <typename _Myvec>
 class sequence_iterator : public sequence_const_iterator<_Myvec> {
 public:
   using _Mybase = sequence_const_iterator<_Myvec>;
@@ -227,7 +227,7 @@ class sequence_iterator : public sequence_const_iterator<_Myvec> {
   constexpr reference operator[](const difference_type _Off) const noexcept { return const_cast<reference>(_Mybase::operator[](_Off)); }
 };
 
-template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer>
+template <typename _Value_type, typename _Size_type, typename _Difference_type, typename _Pointer, typename _Const_pointer>
 struct _Vec_iter_types {
   using value_type      = _Value_type;
   using size_type       = _Size_type;
@@ -272,10 +272,10 @@ struct _Vector_val {
   pointer _Myend;
 };
 
-template <class _Ty, class _Alloc = std::allocator<_Ty>, fill_policy _FillPolicy = fill_policy::always>
+template <typename _Ty, typename _Alloc = std::allocator<_Ty>, fill_policy _FillPolicy = fill_policy::always>
 class vector { // varying size array of values
 private:
-  template <class>
+  template <typename>
   friend class _Vb_val;
   friend __tidy_guard<vector>;
 
@@ -374,7 +374,7 @@ class vector { // varying size array of values
     _Construct_n(_Count, _Val);
   }
 
-  template <class _Iter, enable_if_t<is_iterator<_Iter>::value, int> = 0>
+  template <typename _Iter, enable_if_t<is_iterator<_Iter>::value, int> = 0>
   constexpr vector(_Iter _First, _Iter _Last, const _Alloc& _Al = _Alloc()) : _Mypair(_TLX __one_then_variadic_args_t{}, _Al)
   {
     auto _UFirst = _First;
@@ -451,7 +451,7 @@ class vector { // varying size array of values
   constexpr ~vector() noexcept { _Tidy(); }
 
 private:
-  template <class... _Valty>
+  template <typename... _Valty>
   constexpr _Ty& _Emplace_one_at_back(_Valty&&... _Val)
   {
     // insert by perfectly forwarding into element at end, provide strong guarantee
@@ -466,7 +466,7 @@ class vector { // varying size array of values
     return *_Emplace_reallocate(_Mylast, std::forward<_Valty>(_Val)...);
   }
 
-  template <class... Valty>
+  template <typename... Valty>
   constexpr _Ty& _Emplace_back_with_unused_capacity(Valty&&... val)
   {
     auto& data    = _Mypair._Myval2;
@@ -487,7 +487,7 @@ class vector { // varying size array of values
     return result;
   }
 
-  template <class... _Valty>
+  template <typename... _Valty>
   constexpr pointer _Emplace_reallocate(const pointer _Whereptr, _Valty&&... _Val)
   {
     // reallocate and insert by perfectly forwarding _Val at _Whereptr
@@ -542,7 +542,7 @@ class vector { // varying size array of values
   }
 
 public:
-  template <class... _Valty>
+  template <typename... _Valty>
   constexpr _Ty& emplace_back(_Valty&&... _Val)
   {
     // insert by perfectly forwarding into element at end, provide strong guarantee
@@ -570,7 +570,7 @@ class vector { // varying size array of values
     return *this;
   }
 
-  template <class _U = value_type, typename = std::enable_if_t<std::is_pointer<_U>::value>>
+  template <typename _Valty = value_type, std::enable_if_t<std::is_pointer_v<_Valty>, int> = 0>
   constexpr void resize(const size_type _Newsize, std::nullptr_t)
   {
     _Resize(_Newsize, _TLX value_init);
@@ -638,7 +638,7 @@ class vector { // varying size array of values
 #pragma endregion
 
 public:
-  template <class... _Valty>
+  template <typename... _Valty>
   constexpr iterator emplace(const_iterator _Where, _Valty&&... _Val)
   {
     auto _Whereptr = _Where._Ptr;
@@ -682,7 +682,7 @@ class vector { // varying size array of values
     return emplace(_Where, std::move(_Val));
   }
 
-  template <class... _Valty>
+  template <typename... _Valty>
   constexpr iterator insert(const_iterator _Where, const size_type _Count, const _Ty& _Val)
   {
     // insert _Count copies of _Val at _Where
@@ -772,7 +772,7 @@ class vector { // varying size array of values
   }
 
 private:
-  template <class _Iter>
+  template <typename _Iter>
   constexpr void _Insert_counted_range(const_iterator _Where, _Iter _First, const size_type _Count)
   {
     // insert counted range _First + [0, _Count) at _Where
@@ -888,7 +888,7 @@ class vector { // varying size array of values
   }
 
 public:
-  template <class _Iter, enable_if_t<tlx::is_iterator_v<_Iter>, int> = 0>
+  template <typename _Iter, enable_if_t<tlx::is_iterator_v<_Iter>, int> = 0>
   constexpr iterator insert(const_iterator _Where, _Iter _First, _Iter _Last)
   {
     auto _Whereptr          = _Where._Ptr;
@@ -947,7 +947,7 @@ class vector { // varying size array of values
   }
 
 private:
-  template <class _Iter>
+  template <typename _Iter>
   constexpr void _Assign_counted_range(_Iter _First, const size_type _Newsize)
   {
     // assign elements from counted range _First + [0, _Newsize)
@@ -999,7 +999,7 @@ class vector { // varying size array of values
   }
 
 public:
-  template <class _Iter, enable_if_t<std::is_pointer_v<_Iter>, int> = 0>
+  template <typename _Iter, enable_if_t<std::is_pointer_v<_Iter>, int> = 0>
   constexpr void assign(_Iter _First, _Iter _Last)
   {
     const auto _Length = static_cast<size_t>(_Last - _First); // pointer difference
@@ -1039,7 +1039,7 @@ class vector { // varying size array of values
   }
 
 private:
-  template <class _Ty2>
+  template <typename _Ty2>
   constexpr void _Resize_reallocate(const size_type _Newsize, const _Ty2& _Val)
   {
     if (_Newsize > max_size())
@@ -1086,7 +1086,7 @@ class vector { // varying size array of values
     _Change_array(_Newvec, _Newsize, _Newcapacity);
   }
 
-  template <class _Ty2>
+  template <typename _Ty2>
   constexpr void _Resize(const size_type _Newsize, const _Ty2& _Val)
   {
     // trim or append elements, provide strong guarantee
@@ -1528,7 +1528,7 @@ class vector { // varying size array of values
     }
   }
 
-  template <class... _Valty>
+  template <typename... _Valty>
   constexpr void _Construct_n(const size_type _Count, _Valty&&... _Val)
   {
     // Dispatch between the three sized constructions:
@@ -1673,15 +1673,15 @@ inline typename _Cont::iterator ordered_insert(_Cont& vec, typename _Cont::value
 
 namespace std
 {
-template <class _Myvec>
+template <typename _Myvec>
 struct pointer_traits<_TLX sequence_const_iterator<_Myvec>> {
   using pointer         = _TLX sequence_const_iterator<_Myvec>;
   using element_type    = const typename pointer::value_type;
   using difference_type = typename pointer::difference_type;
 
   static constexpr element_type* to_address(const pointer _Iter) noexcept { return std::to_address(_Iter._Ptr); }
 };
-template <class _Myvec>
+template <typename _Myvec>
 struct pointer_traits<_TLX sequence_iterator<_Myvec>> {
   using pointer         = _TLX sequence_iterator<_Myvec>;
   using element_type    = typename pointer::value_type;