Tidy up

Author: halx99

3rdparty/CMakeLists.txt

@@ -119,13 +119,13 @@ function(ax_add_3rd source_dir)
           set_target_properties(${tgt} PROPERTIES
             ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
             LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"        
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
             FOLDER "3rdparty"
           )
-        else()      
+        else()
           set_target_properties(${tgt} PROPERTIES
             ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"         
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
             FOLDER "3rdparty"
           )
         endif()
@@ -383,6 +383,11 @@ if(AX_WITH_LZ4)
   )
 endif()
 
+if(AX_ENABLE_MEMORY_TRACKER)
+  _1kfetch(minhook)
+  ax_add_3rd(${minhook_SOURCE_DIR} NO_LINK TARGETS minhook)
+endif()
+
 if(AX_WITH_DOCTEST)
   ax_add_3rd(doctest NO_LINK)
 endif()

3rdparty/yasio/yasio/array_buffer.hpp

@@ -31,33 +31,33 @@ SOFTWARE.
 #  include "sol2/sol.hpp" // sol2-2.x
 #endif
 
-// use cxx17::string_view workaround with std::string_view
+// use std::string_view workaround with std::string_view
 #if !YASIO__HAS_CXX17
 namespace sol
 {
 namespace stack
 {
 template <>
-struct pusher<cxx17::string_view> {
-  static int push(lua_State* L, const cxx17::string_view& str)
+struct pusher<std::string_view> {
+  static int push(lua_State* L, const std::string_view& str)
   {
     lua_pushlstring(L, !str.empty() ? str.c_str() : "", str.length());
     return 1;
   }
 };
 template <>
-struct getter<cxx17::string_view> {
-  static cxx17::string_view get(lua_State* L, int index, record& tracking)
+struct getter<std::string_view> {
+  static std::string_view get(lua_State* L, int index, record& tracking)
   {
     tracking.use(1); // THIS IS THE ONLY BIT THAT CHANGES
     size_t len    = 0;
     const char* s = lua_tolstring(L, index, &len);
-    return cxx17::string_view(s, len);
+    return std::string_view(s, len);
   }
 };
 } // namespace stack
 template <>
-struct lua_type_of<cxx17::string_view> : std::integral_constant<type, type::string> {};
+struct lua_type_of<std::string_view> : std::integral_constant<type, type::string> {};
 } // namespace sol
 #endif
 

3rdparty/yasio/yasio/bindings/yasio_sol.hpp

@@ -259,18 +259,7 @@ SOFTWARE.
 
 #define YASIO__STD ::std::
 
-#if YASIO__HAS_CXX14
-namespace cxx14
-{
-using namespace std;
-};
-#endif
-
-#if YASIO__HAS_CXX17
-namespace cxx17
-{
-using namespace std;
-};
-#endif
+// The yasio is the original tlx provider
+#define _TLX ::tlx::
 
 #endif

3rdparty/yasio/yasio/compiler/feature_test.hpp

@@ -123,8 +123,8 @@ class binary_reader_impl {
   using convert_traits_type = _Traits;
   using this_type           = binary_reader_impl<_Traits>;
   binary_reader_impl() { this->reset("", 0); }
-  binary_reader_impl(const sbyte_buffer& d) { this->reset(d); }
-  binary_reader_impl(const cxx17::string_view& d) { this->reset(d); }
+  binary_reader_impl(const tlx::sbyte_buffer& d) { this->reset(d); }
+  binary_reader_impl(const std::string_view& d) { this->reset(d); }
   binary_reader_impl(const void* data, size_t size) { this->reset(data, size); }
   template <typename _BufferType>
   binary_reader_impl(const binary_writer_impl<_Traits, _BufferType>* obs)
@@ -143,8 +143,8 @@ class binary_reader_impl {
 
   ~binary_reader_impl() {}
 
-  void reset(const sbyte_buffer& d) { reset(d.data(), d.size()); }
-  void reset(const cxx17::string_view& d) { reset(d.data(), d.length()); }
+  void reset(const tlx::sbyte_buffer& d) { reset(d.data(), d.size()); }
+  void reset(const std::string_view& d) { reset(d.data(), d.length()); }
   void reset(const void* data, size_t size)
   {
     first_ = ptr_ = static_cast<const char*>(data);
@@ -165,15 +165,15 @@ class binary_reader_impl {
 
   int read_varint(int size)
   {
-    size = yasio::clamp(size, 1, YASIO_SSIZEOF(int));
+    size = std::clamp(size, 1, YASIO_SSIZEOF(int));
 
     int value = 0;
     ::memcpy(&value, consume(size), size);
     return convert_traits_type::fromint(value, size);
   }
 
   /* read blob data with '7bit encoded int' length field */
-  cxx17::string_view read_v()
+  std::string_view read_v()
   {
     int count = read_ix<int>();
     return read_bytes(count);
@@ -210,15 +210,15 @@ class binary_reader_impl {
       ::memcpy(oav, consume(len), len);
   }
 
-  cxx17::string_view read_v32() { return read_v_fx<uint32_t>(); }
-  cxx17::string_view read_v16() { return read_v_fx<uint16_t>(); }
-  cxx17::string_view read_v8() { return read_v_fx<uint8_t>(); }
+  std::string_view read_v32() { return read_v_fx<uint32_t>(); }
+  std::string_view read_v16() { return read_v_fx<uint16_t>(); }
+  std::string_view read_v8() { return read_v_fx<uint8_t>(); }
 
-  cxx17::string_view read_bytes(int len)
+  std::string_view read_bytes(int len)
   {
     if (len > 0)
-      return cxx17::string_view(consume(len), len);
-    return cxx17::string_view{};
+      return std::string_view(consume(len), len);
+    return std::string_view{};
   }
 
   bool empty() const { return first_ == last_; }
@@ -264,19 +264,19 @@ class binary_reader_impl {
   }
 
   template <typename _LenT>
-  inline cxx17::string_view read_v_fx()
+  inline std::string_view read_v_fx()
   {
     _LenT n = this->read<_LenT>();
     if (n > 0)
       return read_bytes(n);
     return {};
   }
 
-  cxx17::string_view range_view(size_t start, size_t end)
+  std::string_view range_view(size_t start, size_t end)
   {
     if (start <= end && (first_ + end) <= last_)
-      return cxx17::string_view{first_ + start, end - start};
-    return cxx17::string_view{};
+      return std::string_view{first_ + start, end - start};
+    return std::string_view{};
   }
 
   bool eof() const { return ptr_ == last_; }
@@ -305,7 +305,7 @@ template <typename _Traits>
 class basic_ibstream : public binary_reader_impl<_Traits> {
 public:
   basic_ibstream() {}
-  basic_ibstream(sbyte_buffer blob) : binary_reader_impl<_Traits>(), blob_(std::move(blob)) { this->reset(blob_.data(), static_cast<int>(blob_.size())); }
+  basic_ibstream(tlx::sbyte_buffer blob) : binary_reader_impl<_Traits>(), blob_(std::move(blob)) { this->reset(blob_.data(), static_cast<int>(blob_.size())); }
   basic_ibstream(const basic_obstream<_Traits>* obs) : binary_reader_impl<_Traits>(), blob_(obs->buffer())
   {
     this->reset(blob_.data(), static_cast<int>(blob_.size()));
@@ -332,7 +332,7 @@ class basic_ibstream : public binary_reader_impl<_Traits> {
   }
 
 protected:
-  sbyte_buffer blob_;
+  tlx::sbyte_buffer blob_;
 };
 
 using ibstream_view = binary_reader_impl<convert_traits<network_convert_tag>>;

3rdparty/yasio/yasio/ibstream.hpp

@@ -51,7 +51,7 @@ YASIO__DECL yssl_ctx_st* yssl_ctx_new(const yssl_options& opts)
       YASIO_LOG("mbedtls_ssl_config_defaults fail with ret=%d", ret);
 
     // rgn engine
-    cxx17::string_view pers = opts.client ? cxx17::string_view{YASIO_SSL_PIN, YASIO_SSL_PIN_LEN} : cxx17::string_view{YASIO_SSL_PON, YASIO_SSL_PON_LEN};
+    std::string_view pers = opts.client ? std::string_view{YASIO_SSL_PIN, YASIO_SSL_PIN_LEN} : std::string_view{YASIO_SSL_PON, YASIO_SSL_PON_LEN};
     ret                     = ::mbedtls_ctr_drbg_seed(&ctx->ctr_drbg, ::mbedtls_entropy_func, &ctx->entropy, (const unsigned char*)pers.data(), pers.length());
     if (ret != 0)
     {

3rdparty/yasio/yasio/impl/mbedtls.hpp

@@ -6,7 +6,7 @@
 // Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
 #ifndef YASIO__POLL_IO_WATCHER_HPP
 #define YASIO__POLL_IO_WATCHER_HPP
-#include "yasio/vector.hpp"
+#include "yasio/tlx/vector.hpp"
 #include "yasio/impl/socket.hpp"
 #include "yasio/impl/select_interrupter.hpp"
 
@@ -77,7 +77,7 @@ class poll_io_watcher {
     }
     return underlying_events;
   }
-  static void pollfd_mod(yasio::vector<pollfd>& fdset, socket_native_type fd, int add_events, int remove_events)
+  static void pollfd_mod(tlx::vector<pollfd>& fdset, socket_native_type fd, int add_events, int remove_events)
   {
     auto it = std::find_if(fdset.begin(), fdset.end(), [fd](const pollfd& pfd) { return pfd.fd == fd; });
     if (it != fdset.end())
@@ -96,8 +96,8 @@ class poll_io_watcher {
   }
 
 protected:
-  yasio::vector<pollfd> events_;
-  yasio::vector<pollfd> revents_;
+  tlx::vector<pollfd> events_;
+  tlx::vector<pollfd> revents_;
 
   select_interrupter interrupter_;
 };