Fixup

Author: halx99

3rdparty/yasio/yasio/io_service.cpp

@@ -46,6 +46,8 @@ SOFTWARE.
 
 #include "yasio/wtimer_hres.hpp"
 
+#include "yasio/tlx/string.hpp"
+
 #if defined(YASIO_ENABLE_KCP)
 struct yasio_kcp_options {
   int kcp_conv_ = 0;

3rdparty/yasio/yasio/tlx/string.hpp

@@ -80,11 +80,11 @@ class basic_string {
   };
   __compressed_pair<allocator_type, _Str_storage> _Mypair;
 
-  basic_string() : _Mypair(__one_then_variadic_args_t{}, _Alloc{}) {}
+  basic_string() : _Mypair(__zero_then_variadic_args_t{}) {}
   basic_string(nullptr_t) = delete;
   explicit basic_string(size_type count) : _Mypair(__one_then_variadic_args_t{}, _Alloc{}) { resize(static_cast<size_type>(count)); }
   basic_string(size_type count, const_reference val) : _Mypair(__one_then_variadic_args_t{}, _Alloc{}) { resize(static_cast<size_type>(count), val); }
-  template <typename _Iter, ::yasio::enable_if_t<::yasio::is_iterator<_Iter>::value, int> = 0>
+  template <typename _Iter, _TLX enable_if_t<_TLX is_iterator<_Iter>::value, int> = 0>
   basic_string(_Iter first, _Iter last) : _Mypair(__one_then_variadic_args_t{}, _Alloc{})
   {
     assign(first, last);
@@ -122,7 +122,7 @@ class basic_string {
     return *this;
   }
 
-  template <typename _Iter, ::yasio::enable_if_t<::yasio::is_iterator<_Iter>::value, int> = 0>
+  template <typename _Iter, _TLX enable_if_t<_TLX is_iterator<_Iter>::value, int> = 0>
   void assign(_Iter first, _Iter last)
   {
     _Assign_range(first, last);
@@ -144,7 +144,7 @@ class basic_string {
     std::swap(a._Myend, b._Myend);
   }
 
-  template <typename _Iter, ::yasio::enable_if_t<::yasio::is_iterator<_Iter>::value, int> = 0>
+  template <typename _Iter, _TLX enable_if_t<_TLX is_iterator<_Iter>::value, int> = 0>
   iterator insert(iterator _Where, _Iter first, _Iter last)
   {
     auto& st     = _Mypair._Myval2;
@@ -205,7 +205,7 @@ class basic_string {
   }
 
   basic_string& append(view_type value) { return this->append(value.begin(), value.end()); }
-  template <typename _Iter, ::yasio::enable_if_t<::yasio::is_iterator<_Iter>::value, int> = 0>
+  template <typename _Iter, _TLX enable_if_t<_TLX is_iterator<_Iter>::value, int> = 0>
   basic_string& append(_Iter first, const _Iter last)
   {
     if (first != last)
@@ -584,7 +584,7 @@ class basic_string {
     return st._Mylast; // points to null terminator slot
   }
 
-  template <typename _Iter, ::yasio::enable_if_t<::yasio::is_iterator<_Iter>::value, int> = 0>
+  template <typename _Iter, _TLX enable_if_t<_TLX is_iterator<_Iter>::value, int> = 0>
   void _Assign_range(_Iter first, _Iter last)
   {
     auto& st    = _Mypair._Myval2;

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

@@ -363,7 +363,9 @@ class vector { // varying size array of values
   using iterator       = sequence_iterator<_Scary_val>;
   using const_iterator = sequence_const_iterator<_Scary_val>;
 
-  constexpr explicit vector(const _Alloc& _Al = _Alloc{}) noexcept : _Mypair(_TLX __one_then_variadic_args_t{}, _Al) {}
+  constexpr vector() noexcept : _Mypair(_TLX __zero_then_variadic_args_t{}) {}
+
+  constexpr explicit vector(const _Alloc& _Al) noexcept : _Mypair(_TLX __one_then_variadic_args_t{}, _Al) {}
 
   constexpr explicit vector(const size_type _Count, const _Alloc& _Al = _Alloc()) : _Mypair(_TLX __one_then_variadic_args_t{}, _Al) { _Construct_n(_Count); }
 
@@ -409,8 +411,8 @@ class vector { // varying size array of values
                 std::exchange(_Right._Mypair._Myval2._Mylast, nullptr), std::exchange(_Right._Mypair._Myval2._Myend, nullptr))
   {}
 
-  constexpr vector(vector&& _Right,
-                   const _TLX identity_t<_Alloc>& _Al_) noexcept(std::allocator_traits<_Alloc>::is_always_equal::value && std::is_nothrow_move_constructible_v<_Ty>)
+  constexpr vector(vector&& _Right, const _TLX identity_t<_Alloc>& _Al_) noexcept(std::allocator_traits<_Alloc>::is_always_equal::value &&
+                                                                                  std::is_nothrow_move_constructible_v<_Ty>)
       : _Mypair(_TLX __one_then_variadic_args_t{}, _Al_)
   {
     _Alty& _Al        = _Getal();

axmol/rhi/opengl/ProgramGL.cpp

@@ -229,7 +229,7 @@ void ProgramImpl::reflectUniformInfos()
     _maxLocation     = -1;
     _activeUniformInfos.clear();
 
-    yasio::basic_byte_buffer<GLchar> buffer;  // buffer for name
+    tlx::basic_byte_buffer<GLchar> buffer;  // buffer for name
 
     // OpenGL UBO: uloc[0]: block_offset, uloc[1]: offset in block