From 939ac568ba8b52d2f3f4b513669d59d5751830c3 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Thu, 20 Feb 2025 19:24:54 +1100 Subject: [PATCH 1/5] ~ documentation markup --- include/unixstl/filesystem/readdir_sequence.hpp | 12 ++++++------ include/winstl/filesystem/readdir_sequence.hpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/unixstl/filesystem/readdir_sequence.hpp b/include/unixstl/filesystem/readdir_sequence.hpp index ddc60211..30406e8f 100644 --- a/include/unixstl/filesystem/readdir_sequence.hpp +++ b/include/unixstl/filesystem/readdir_sequence.hpp @@ -4,11 +4,11 @@ * Purpose: readdir_sequence class. * * Created: 15th January 2002 - * Updated: 28th December 2024 + * Updated: 20th February 2025 * * Home: http://stlsoft.org/ * - * Copyright (c) 2019-2024, Matthew Wilson and Synesis Information Systems + * Copyright (c) 2019-2025, Matthew Wilson and Synesis Information Systems * Copyright (c) 2002-2019, Matthew Wilson and Synesis Software * All rights reserved. * @@ -54,7 +54,7 @@ # define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MAJOR 5 # define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MINOR 2 # define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_REVISION 6 -# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_EDIT 165 +# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_EDIT 166 #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ @@ -242,9 +242,9 @@ class readdir_sequence public: enum { - includeDots = 0x0008 /*!< Requests that dots directories be included in the returned sequence */ - , directories = 0x0010 /*!< Causes the search to include directories */ - , files = 0x0020 /*!< Causes the search to include files */ + includeDots = 0x0008 /*!< Requests that dots directories be included in the returned sequence. */ + , directories = 0x0010 /*!< Causes the search to include directories. */ + , files = 0x0020 /*!< Causes the search to include files. */ #ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION , sockets = 0x0000 /*!< CURRENTLY UNSUPPORTED : DO NOT USE! This exists for forward compatibility with STLSoft 1.10 test programs, and is subject to change in the future. A future version will support sockets, but it may not use this enumerator name. */ #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ diff --git a/include/winstl/filesystem/readdir_sequence.hpp b/include/winstl/filesystem/readdir_sequence.hpp index 6b890a4a..517e5846 100644 --- a/include/winstl/filesystem/readdir_sequence.hpp +++ b/include/winstl/filesystem/readdir_sequence.hpp @@ -4,11 +4,11 @@ * Purpose: Platform header for the readdir_sequence components. * * Created: 29th April 2006 - * Updated: 19th December 2024 + * Updated: 20th February 2025 * * Home: http://stlsoft.org/ * - * Copyright (c) 2019-2024, Matthew Wilson and Synesis Information Systems + * Copyright (c) 2019-2025, Matthew Wilson and Synesis Information Systems * Copyright (c) 2006-2019, Matthew Wilson and Synesis Software * All rights reserved. * @@ -56,7 +56,7 @@ # define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MAJOR 3 # define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MINOR 0 # define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_REVISION 1 -# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_EDIT 38 +# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_EDIT 39 #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ @@ -135,9 +135,9 @@ class readdir_sequence public: enum search_flags { - includeDots = 0x0008 /*!< Requests that dots directories be included in the returned sequence */ - , directories = 0x0010 /*!< Causes the search to include directories */ - , files = 0x0020 /*!< Causes the search to include files */ + includeDots = 0x0008 /*!< Requests that dots directories be included in the returned sequence. */ + , directories = 0x0010 /*!< Causes the search to include directories. */ + , files = 0x0020 /*!< Causes the search to include files. */ , fullPath = 0x0100 /*!< Each file entry is presented as a full path relative to the search directory. */ , absolutePath = 0x0200 /*!< The search directory is converted to an absolute path. */ }; From 29a137fb4f918c117c269282fa1b2452cb74c017 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Thu, 20 Feb 2025 20:06:55 +1100 Subject: [PATCH 2/5] `unixstl::readdir_sequence` now supports `sockets` --- .../unixstl/filesystem/readdir_sequence.hpp | 24 ++-- .../winstl/filesystem/readdir_sequence.hpp | 7 +- .../entry.cpp | 135 +++++++++++++++++- 3 files changed, 147 insertions(+), 19 deletions(-) diff --git a/include/unixstl/filesystem/readdir_sequence.hpp b/include/unixstl/filesystem/readdir_sequence.hpp index 30406e8f..4cac4495 100644 --- a/include/unixstl/filesystem/readdir_sequence.hpp +++ b/include/unixstl/filesystem/readdir_sequence.hpp @@ -52,9 +52,9 @@ #ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION # define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MAJOR 5 -# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MINOR 2 -# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_REVISION 6 -# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_EDIT 166 +# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MINOR 3 +# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_REVISION 1 +# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_EDIT 167 #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ @@ -245,9 +245,7 @@ class readdir_sequence includeDots = 0x0008 /*!< Requests that dots directories be included in the returned sequence. */ , directories = 0x0010 /*!< Causes the search to include directories. */ , files = 0x0020 /*!< Causes the search to include files. */ -#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION - , sockets = 0x0000 /*!< CURRENTLY UNSUPPORTED : DO NOT USE! This exists for forward compatibility with STLSoft 1.10 test programs, and is subject to change in the future. A future version will support sockets, but it may not use this enumerator name. */ -#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ + , sockets = 0x0040 /*!< Causes the search to include sockets. */ , typeMask = 0x0070 , fullPath = 0x0100 /*!< Each file entry is presented as a full path relative to the search directory. */ , absolutePath = 0x0200 /*!< The search directory is converted to an absolute path. */ @@ -547,6 +545,7 @@ readdir_sequence::validate_flags_( | 0 | directories | files + | sockets | 0 | fullPath | absolutePath @@ -555,7 +554,7 @@ readdir_sequence::validate_flags_( UNIXSTL_MESSAGE_ASSERT("Specification of unrecognised/unsupported flags", flags == (flags & validFlags)); STLSOFT_SUPPRESS_UNUSED(validFlags); - if (0 == (flags & (directories | files))) + if (0 == (flags & (directories | files | sockets))) { flags |= (directories | files); } @@ -886,14 +885,15 @@ readdir_sequence::const_iterator::operator ++() else { #ifndef _WIN32 - // Test for sockets : this version does not support sockets, - // but does elide them from the search results. - if (traits_type::is_socket(&st)) + if (m_flags & sockets) // want sockets { - continue; + if (traits_type::is_socket(&st)) + { + // It is a socket, so accept it + break; + } } #endif /* !_WIN32 */ - if (m_flags & directories) // Want directories { if (traits_type::is_directory(&st)) diff --git a/include/winstl/filesystem/readdir_sequence.hpp b/include/winstl/filesystem/readdir_sequence.hpp index 517e5846..055daa3f 100644 --- a/include/winstl/filesystem/readdir_sequence.hpp +++ b/include/winstl/filesystem/readdir_sequence.hpp @@ -55,8 +55,8 @@ #ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION # define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MAJOR 3 # define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_MINOR 0 -# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_REVISION 1 -# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_EDIT 39 +# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_REVISION 2 +# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_READDIR_SEQUENCE_EDIT 40 #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ @@ -138,6 +138,9 @@ class readdir_sequence includeDots = 0x0008 /*!< Requests that dots directories be included in the returned sequence. */ , directories = 0x0010 /*!< Causes the search to include directories. */ , files = 0x0020 /*!< Causes the search to include files. */ +#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION + , sockets = 0x0000 /*!< This has no effect on Windows, but is here for structural conformance compatibility with unixstl::readdir_sequence. */ +#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ , fullPath = 0x0100 /*!< Each file entry is presented as a full path relative to the search directory. */ , absolutePath = 0x0200 /*!< The search directory is converted to an absolute path. */ }; diff --git a/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp b/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp index 622a99f5..105647a1 100644 --- a/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp +++ b/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Component test for `unixstl::readdir_sequence`. * * Created: sometime in 2010s - * Updated: 28th December 2024 + * Updated: 20th February 2025 * * ////////////////////////////////////////////////////////////////////// */ @@ -21,11 +21,13 @@ */ /* xTests header files */ -#include +#include #include /* STLSoft header files */ -#include +#include +#include +#include /* Standard C header files */ #include @@ -40,6 +42,10 @@ namespace static void test_empty_directory(); static void test_non_empty_directory(); +#ifdef PLATFORMSTL_OS_IS_UNIX + + static void TEST_is_socket(); +#endif } // anonymous namespace @@ -58,6 +64,10 @@ int main(int argc, char *argv[]) { XTESTS_RUN_CASE(test_empty_directory); XTESTS_RUN_CASE(test_non_empty_directory); +#ifdef PLATFORMSTL_OS_IS_UNIX + + XTESTS_RUN_CASE(TEST_is_socket); +#endif XTESTS_PRINT_RESULTS(); @@ -75,9 +85,47 @@ int main(int argc, char *argv[]) namespace { + typedef platformstl::filesystem_traits fs_traits_t; + typedef platformstl::path path_t; typedef unixstl::readdir_sequence readdir_sequence_t; - using ::xtests::cpp::util::temp_directory; +} // anonymous namespace + + #include + #include + + int + create_uds_socket_and_bind( + char const* uds_path + ) + { + assert(NULL != uds_path); + + { + struct sockaddr_un sa; + size_t const len = strlen(uds_path); + + if (len >= STLSOFT_NUM_ELEMENTS(sa.sun_path)) + { + return EINVAL; + } + else + { + sa.sun_len = sizeof(sa); + sa.sun_family = AF_UNIX; + strncpy(sa.sun_path, uds_path, 1 + len); + + } + + } + + + + return -1; + } + +namespace +{ static void test_empty_directory() @@ -85,7 +133,6 @@ static void test_empty_directory() temp_directory dir(temp_directory::EmptyOnClose | temp_directory::EmptyOnOpen | temp_directory::RemoveOnClose); readdir_sequence_t rds(dir); - // readdir_sequence_t rds(dir.c_str()); XTESTS_TEST_BOOLEAN_TRUE(rds.empty()); } @@ -97,6 +144,84 @@ static void test_non_empty_directory() XTESTS_TEST_BOOLEAN_FALSE(rds.empty()); } +#ifdef PLATFORMSTL_OS_IS_UNIX + +static void TEST_is_socket() +{ + + path_t td_path; + + { + temp_directory td(temp_directory::EmptyOnOpen | temp_directory::EmptyOnClose | temp_directory::RemoveOnClose); + + path_t path(td.c_str()); + path_t sk_path = path / "tmp.sock"; + + td_path = td.c_str(); + + int sk = socket(AF_UNIX, SOCK_STREAM, 0); + + if (-1 == sk) + { + int const e = errno; + + TEST_FAIL_WITH_QUALIFIER("failed to create socket", strerror(e)); + } + else + { + stlsoft::scoped_handle scoper(sk, close); + + struct sockaddr_un sa; + + if (sk_path.length() >= STLSOFT_NUM_ELEMENTS(sa.sun_path)) + { + TEST_FAIL_WITH_QUALIFIER("socket_path is too long to test", sk_path); + } + else + { + sa.sun_len = sizeof(sa); + sa.sun_family = AF_UNIX; + strcpy(sa.sun_path, sk_path.c_str()); + + int const r = bind(sk, (struct sockaddr*)&sa, sizeof(sa)); + + if (0 != r) + { + int const e = errno; + + TEST_FAIL_WITH_QUALIFIER("failed to bind socket", strerror(e)); + } + else + { + + + readdir_sequence_t rds(td.c_str(), readdir_sequence_t::sockets | readdir_sequence_t::fullPath); + size_t n = 0; + path_t first; + + for (readdir_sequence_t::const_iterator i = rds.begin(); rds.end() != i; ++i, ++n) + { + if (first.empty()) + { + first = *i; + } + } + + scoper.close(); + + unlink(sk_path.c_str()); + + TEST_INT_EQ(1u, n); + + TEST_MULTIBYTE_STRING_EQUAL(sk_path, first); + } + } + } + } + + TEST_BOOLEAN_FALSE(fs_traits_t::file_exists(td_path.c_str())); +} +#endif } // anonymous namespace From 0d5eb7961bb96748ed49f5dda66f200ce1ec9e00 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Fri, 21 Feb 2025 13:17:20 +1100 Subject: [PATCH 3/5] ~ GCC compatibility --- .../entry.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp b/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp index 105647a1..e1770e97 100644 --- a/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp +++ b/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp @@ -111,7 +111,9 @@ namespace } else { +#ifdef UNIXSTL_OS_IS_MACOSX sa.sun_len = sizeof(sa); +#endif sa.sun_family = AF_UNIX; strncpy(sa.sun_path, uds_path, 1 + len); @@ -179,7 +181,9 @@ static void TEST_is_socket() } else { +#ifdef UNIXSTL_OS_IS_MACOSX sa.sun_len = sizeof(sa); +#endif sa.sun_family = AF_UNIX; strcpy(sa.sun_path, sk_path.c_str()); From aff93760f3f713937cad9692d87812eba5c71edd Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Fri, 21 Feb 2025 14:02:29 +1100 Subject: [PATCH 4/5] ~ tidying --- .../entry.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp b/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp index e1770e97..530f4322 100644 --- a/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp +++ b/test/component/unixstl/filesystem/test.component.unixstl.filesystem.readdir_sequence/entry.cpp @@ -4,7 +4,7 @@ * Purpose: Component test for `unixstl::readdir_sequence`. * * Created: sometime in 2010s - * Updated: 20th February 2025 + * Updated: 21st February 2025 * * ////////////////////////////////////////////////////////////////////// */ @@ -171,7 +171,7 @@ static void TEST_is_socket() } else { - stlsoft::scoped_handle scoper(sk, close); + stlsoft::scoped_handle scoper_sk(sk, close); struct sockaddr_un sa; @@ -197,7 +197,7 @@ static void TEST_is_socket() } else { - + stlsoft::scoped_handle scoper_file(sk_path.c_str(), unlink); readdir_sequence_t rds(td.c_str(), readdir_sequence_t::sockets | readdir_sequence_t::fullPath); size_t n = 0; @@ -211,10 +211,6 @@ static void TEST_is_socket() } } - scoper.close(); - - unlink(sk_path.c_str()); - TEST_INT_EQ(1u, n); TEST_MULTIBYTE_STRING_EQUAL(sk_path, first); From 4a0d12746d969ef219d7f5800d26c89042f8bec5 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Fri, 21 Feb 2025 14:05:57 +1100 Subject: [PATCH 5/5] ~ project(s) version(s) and boilerplate --- CHANGES.txt | 8 ++++++-- HISTORY.md | 3 ++- NEWS.md | 2 +- include/stlsoft/stlsoft.h | 8 ++++---- include/unixstl/unixstl.h | 11 ++++++----- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 32e41572..44a2936a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,7 +2,7 @@ STLSoft - Changes ; Created: 29th March 2002 -; Updated: 31st January 2025 +; Updated: 21st February 2025 ============================================================================ @@ -19,17 +19,21 @@ STLSoft - Changes -Changes for 1.11.1-beta2 (31st January 2025) +Changes for 1.11.1-beta2 (21st February 2025) General: ======== + * `unixstl::readdir_sequence` now can search for sockets, in addition to files and directories; * GCC (11) compatibility around use of `__builtin_is_constant_evaluated` (when not C++20); * T.B.C. Changes: ======== +`unixstl::readdir_sequence` now can search for sockets, in addition to files and directories: + * T.B.C. + GCC (11) compatibility around use of `__builtin_is_constant_evaluated` (when not C++20): * **stlsoft/stlsoft.h** : ~ `__builtin_is_constant_evaluated` must be called as if a function; diff --git a/HISTORY.md b/HISTORY.md index 648f1b59..6ef12d0e 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,9 +4,10 @@ ---- -31st January 2025 - 1.11.1-beta2 released +21st February 2025 - 1.11.1-beta2 released ----------------------------------------- + * `unixstl::readdir_sequence` now can search for sockets, in addition to files and directories; * GCC (11) compatibility around use of `__builtin_is_constant_evaluated` (when not C++20); diff --git a/NEWS.md b/NEWS.md index a3a01214..eb51cf25 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,7 +3,7 @@ | Date | News Item | | --------------------- | --------------------------------------------------------- | -| 31st January 2025 | Release of STLSoft 1.11.1-beta2 | +| 21st February 2025 | Release of STLSoft 1.11.1-beta2 | | 31st December 2024 | Release of STLSoft 1.11.1-beta1 | | 28th December 2024 | Release of STLSoft 1.11.1-alpha28 | | 19th December 2024 | Release of STLSoft 1.11.1-alpha27 | diff --git a/include/stlsoft/stlsoft.h b/include/stlsoft/stlsoft.h index 6015d851..6a402044 100644 --- a/include/stlsoft/stlsoft.h +++ b/include/stlsoft/stlsoft.h @@ -5,7 +5,7 @@ * and platform discriminations, and definitions of types. * * Created: 15th January 2002 - * Updated: 30th January 2025 + * Updated: 21dst February 2025 * * Home: http://stlsoft.org/ * @@ -55,8 +55,8 @@ #ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION # define STLSOFT_VER_STLSOFT_H_STLSOFT_MAJOR 3 # define STLSOFT_VER_STLSOFT_H_STLSOFT_MINOR 57 -# define STLSOFT_VER_STLSOFT_H_STLSOFT_REVISION 5 -# define STLSOFT_VER_STLSOFT_H_STLSOFT_EDIT 585 +# define STLSOFT_VER_STLSOFT_H_STLSOFT_REVISION 6 +# define STLSOFT_VER_STLSOFT_H_STLSOFT_EDIT 586 #else /* ? STLSOFT_DOCUMENTATION_SKIP_SECTION */ /* # include "./internal/doxygen_defs.h" */ #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ @@ -377,7 +377,7 @@ # define _STLSOFT_VER_1_11_1_A27 0x010b015b /*!< Version 1.11.1 alpha 27 (19th December 2024) */ # define _STLSOFT_VER_1_11_1_A28 0x010b015c /*!< Version 1.11.1 alpha 28 (28th December 2024) */ # define _STLSOFT_VER_1_11_1_B1 0x010b0181 /*!< Version 1.11.1 beta 1 (31st December 2024) */ -# define _STLSOFT_VER_1_11_1_B2 0x010b0182 /*!< Version 1.11.1 beta 2 (31st January 2024) */ +# define _STLSOFT_VER_1_11_1_B2 0x010b0182 /*!< Version 1.11.1 beta 2 (21st February 2024) */ #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ #define _STLSOFT_VER_MAJOR 1 diff --git a/include/unixstl/unixstl.h b/include/unixstl/unixstl.h index 3912c22d..107cc55d 100644 --- a/include/unixstl/unixstl.h +++ b/include/unixstl/unixstl.h @@ -5,11 +5,11 @@ * platform discriminations, and definitions of types. * * Created: 15th January 2002 - * Updated: 13th October 2024 + * Updated: 21st February 2025 * * Home: http://stlsoft.org/ * - * Copyright (c) 2019-2024, Matthew Wilson and Synesis Information Systems + * Copyright (c) 2019-2025, Matthew Wilson and Synesis Information Systems * Copyright (c) 2002-2019, Matthew Wilson and Synesis Software * All rights reserved. * @@ -50,8 +50,8 @@ #ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION # define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_MAJOR 3 # define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_MINOR 10 -# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_REVISION 9 -# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_EDIT 120 +# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_REVISION 10 +# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_EDIT 121 #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ /** \file unixstl/unixstl.h @@ -147,12 +147,13 @@ # define _UNIXSTL_VER_1_8_4 0x010804ff /*!< Version 1.8.4 (with STLSoft 1.11.1 alpha 8) */ # define _UNIXSTL_VER_1_8_5 0x010805ff /*!< Version 1.8.5 (with STLSoft 1.11.1 alpha 12) */ # define _UNIXSTL_VER_1_8_6_A01 0x01080641 /*!< Version 1.8.8 alpha 1 (with STLSoft 1.11.1 alpha 17) */ +# define _UNIXSTL_VER_1_8_6_B01 0x01080681 /*!< Version 1.8.8 beta 1 (with STLSoft 1.11.1 beta 2) */ #endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */ #define _UNIXSTL_VER_MAJOR 1 #define _UNIXSTL_VER_MINOR 8 #define _UNIXSTL_VER_REVISION 6 -#define _UNIXSTL_VER _UNIXSTL_VER_1_8_6_A01 +#define _UNIXSTL_VER _UNIXSTL_VER_1_8_6_B01 /* /////////////////////////////////////////////////////////////////////////