Skip to content

Commit

Permalink
Fix solaris ci
Browse files Browse the repository at this point in the history
  • Loading branch information
halx99 committed Mar 1, 2025
1 parent d92a4d2 commit 82e923c
Show file tree
Hide file tree
Showing 71 changed files with 82 additions and 77 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/solaris-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: solaris

on:
workflow_dispatch:
on: push

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion 1k/fetch.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# _1kfetch_cache_dir
# _1kfetch_manifest
#
cmake_minimum_required(VERSION 3.23)
# cmake_minimum_required(VERSION 3.23)

### 1kdist url
find_program(PWSH_PROG NAMES pwsh powershell NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
yasio-4.3.2

1. Fix API `xxsocket::resolve` compatibility issue on android and freebsd.
1. Fix API `xxsocket::resolve` compatibility issue on android and freebsd
2. Add pod_vector pop_back support
3. Add ibstream_view read_blob
4. Make pod_vector more compatible stl
5. Fix compile warnings with clang-19
6. Fix string.hpp data semantic
7. Fix solaris ci



yasio-4.3.1

1. Refining the resource cleanup process for io_service during the handle_stop phase, particularly when a worker thread is terminated externally
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ elseif(YASIO_SSL_BACKEND EQUAL 2) # mbedtls
set(ENABLE_PROGRAMS OFF CACHE BOOL "Build mbedtls programs" FORCE)
set(ENABLE_TESTING OFF CACHE BOOL "Build mbed TLS tests." FORCE)
if(MSVC_VERSION AND (MSVC_VERSION LESS 1900))
set(MBEDTLS_VER "2.28.7")
set(MBEDTLS_VER "2.28.9")
message(AUTHOR_WARNING "Using mbedtls ${MBEDTLS_VER} for vs2013 happy")
else()
set(MBEDTLS_VER "3.6.0")
set(MBEDTLS_VER "3.6.2")
endif()
if (PWSH_COMMAND)
_1kadd_pkg("gh:Mbed-TLS/mbedtls#v${MBEDTLS_VER}" OPTIONS "MBEDTLS_FATAL_WARNINGS OFF")
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/lyasio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//////////////////////////////////////////////////////////////////////////////////////////
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/lyasio.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/yasio_axlua.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/yasio_axlua.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/yasio_jsb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/yasio_jsb.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/yasio_jsb20.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/yasio_jsb20.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/yasio_ni.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/bindings/yasio_sol.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//////////////////////////////////////////////////////////////////////////////////////////
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
Expand Down
2 changes: 1 addition & 1 deletion yasio/buffer_alloc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/byte_buffer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/compiler/feature_test.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/endian_portable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/errc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/file.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions yasio/ibstream.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -194,10 +194,10 @@ class binary_reader_impl {
{
return read_blob(&out, static_cast<int>(sizeof(_Ty)), 1);
}
template <typename _Ty, size_t _N>
size_t read_blob(_Ty (&out)[_N])
template <typename _Ty, size_t _Count>
size_t read_blob(_Ty (&out)[_Count])
{
return read_blob(out, static_cast<int>(sizeof(_Ty)), static_cast<int>(_N));
return read_blob(out, static_cast<int>(sizeof(_Ty)), static_cast<int>(_Count));
}
size_t read_blob(void* out, int size, int count)
{
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/ares.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/concurrent_queue.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/epoll_io_watcher.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// client application.
//////////////////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
#ifndef YASIO__EPOLL_IO_WATCHER_HPP
#define YASIO__EPOLL_IO_WATCHER_HPP
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/eventfd_select_interrupter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// client application.
//////////////////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
// Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com)
//
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/evport_io_watcher.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// client application.
//////////////////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
#ifndef YASIO__EVPORT_IO_WATCHER_HPP
#define YASIO__EVPORT_IO_WATCHER_HPP
#include <chrono>
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/fp16.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/ifaddrs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/inet_ntop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/kqueue_io_watcher.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// client application.
//////////////////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
#ifndef YASIO__KQUEUE_IO_WATCHER_HPP
#define YASIO__KQUEUE_IO_WATCHER_HPP
#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/mbedtls.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/object_pool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/openssl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/pipe_select_interrupter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//////////////////////////////////////////////////////////////////////////////////////////
//
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
// Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com)
//
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/poll_io_watcher.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// client application.
//////////////////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
#ifndef YASIO__POLL_IO_WATCHER_HPP
#define YASIO__POLL_IO_WATCHER_HPP
#include "yasio/pod_vector.hpp"
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/select_interrupter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// client application.
//////////////////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/select_io_watcher.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// client application.
//////////////////////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
#ifndef YASIO__SELECT_IO_WATCHER_HPP
#define YASIO__SELECT_IO_WATCHER_HPP
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/socket.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion yasio/impl/socket_select_interrupter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//////////////////////////////////////////////////////////////////////////////////////////
//
//
// Copyright (c) 2012-2024 HALX99 (halx99 at live dot com)
// Copyright (c) 2012-2025 HALX99 (halx99 at live dot com)
// Copyright (c) 2003-2020 Christopher M. Kohlhoff (chris at kohlhoff dot com)
// Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com)
//
Expand Down
2 changes: 1 addition & 1 deletion yasio/io_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
The MIT License (MIT)
Copyright (c) 2012-2024 HALX99
Copyright (c) 2012-2025 HALX99
HAL: Hardware Abstraction Layer
X99: Intel X99 Mainboard Platform
Expand Down
Loading

0 comments on commit 82e923c

Please sign in to comment.