diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a63979a..9c9f48d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,7 +177,7 @@ configure_package_config_file( write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/smlConfigVersion.cmake - VERSION 1.1.9 + VERSION 1.1.10 COMPATIBILITY SameMajorVersion ) diff --git a/README.md b/README.md index b524c3e5..fbe4d6fd 100644 --- a/README.md +++ b/README.md @@ -313,6 +313,7 @@ send: 42 * [Plant UML Integration](https://boost-ext.github.io/sml/examples.html#plant-uml-integration) * [FAQ](https://boost-ext.github.io/sml/faq.html) * [CHANGELOG](https://boost-ext.github.io/sml/CHANGELOG.html) + * [[1.1.10] - 2024-03-09](https://boost-ext.github.io/sml/CHANGELOG.html#1110-2024-03-09) * [[1.1.9] - 2023-09-13](https://boost-ext.github.io/sml/CHANGELOG.html#119-2023-09-13) * [[1.1.6] - 2022-09-07](https://boost-ext.github.io/sml/CHANGELOG.html#116-2022-09-07) * [[1.1.5] - 2022-03-23](https://boost-ext.github.io/sml/CHANGELOG.html#115-2022-03-23) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index b2502e9e..62fdf0df 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,15 @@ +## [1.1.10] - 2024-03-09 +- **Bug Fixes** + - [Issues](https://github.com/boost-ext/sml/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+closed%3A2023-09-13..2024-03-09+) + +- **Contributions** + - [Sebastian Michel](https://github.com/boost-ext/sml/commits?author=devzeb) + - [rvdvvdw](https://github.com/rvdvvdw) + - [Beartama](https://github.com/uyha) + - [michaelcorreia-adt](https://github.com/michaelcorreia-adt) + - [Julian Meyers](https://github.com/J-Meyers) + - [Marco Bergamin](https://github.com/marcobergamin) + ## [1.1.9] - 2023-09-13 - [Issues](https://github.com/boost-ext/sml/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+closed%3A2022-09-07..2023-09-13+) diff --git a/include/boost/sml.hpp b/include/boost/sml.hpp index 783d344e..b1939816 100644 --- a/include/boost/sml.hpp +++ b/include/boost/sml.hpp @@ -1,5 +1,5 @@ // -// Copyright (c) 2016-2020 Kris Jusiak (kris at jusiak dot net) +// Copyright (c) 2016-2024 Kris Jusiak (kris at jusiak dot net) // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -9,12 +9,12 @@ #if (__cplusplus < 201305L && _MSC_VER < 1900) #error "[Boost::ext].SML requires C++14 support (Clang-3.4+, GCC-5.1+, MSVC-2015+)" #else -#define BOOST_SML_VERSION 1'1'9 +#define BOOST_SML_VERSION 1'1'10 #define BOOST_SML_NAMESPACE_BEGIN \ namespace boost { \ inline namespace ext { \ namespace sml { \ - inline namespace v1_1_9 { + inline namespace v1_1_10 { #define BOOST_SML_NAMESPACE_END \ } \ } \ @@ -1110,8 +1110,8 @@ template transitions get_state_mapping_impl(state_mappings> *); template struct get_state_mapping { - using type = aux::conditional_t((TMappings *)0)), transitions>::value, - decltype(get_state_mapping_impl<_, TUnexpected>((TMappings *)0)), + using type = aux::conditional_t((TMappings *)0)), transitions>::value, + decltype(get_state_mapping_impl<_, TUnexpected>((TMappings *)0)), decltype(get_state_mapping_impl((TMappings *)0))>; }; template