diff --git a/include/etl/private/variant_variadic.h b/include/etl/private/variant_variadic.h index 38e987a5..06ff1933 100644 --- a/include/etl/private/variant_variadic.h +++ b/include/etl/private/variant_variadic.h @@ -536,7 +536,7 @@ namespace etl { static_assert(etl::is_one_of, TTypes...>::value, "Unsupported type"); - construct_in_place>(data, std::forward(value)); + construct_in_place>(data, etl::forward(value)); } //*************************************************************************** @@ -550,7 +550,7 @@ namespace etl { static_assert(etl::is_one_of, TTypes...>::value, "Unsupported type"); - construct_in_place_args>(data, std::forward(args)...); + construct_in_place_args>(data, etl::forward(args)...); } //*************************************************************************** @@ -564,7 +564,7 @@ namespace etl using type = typename private_variant::parameter_pack:: template type_from_index_t; static_assert(etl::is_one_of ::value, "Unsupported type"); - construct_in_place_args(data, std::forward(args)...); + construct_in_place_args(data, etl::forward(args)...); operation = operation_type::value, etl::is_move_constructible::value>::do_operation; } @@ -581,7 +581,7 @@ namespace etl { static_assert(etl::is_one_of, TTypes...> ::value, "Unsupported type"); - construct_in_place_args>(data, init, std::forward(args)...); + construct_in_place_args>(data, init, etl::forward(args)...); } //*************************************************************************** @@ -595,7 +595,7 @@ namespace etl using type = typename private_variant::parameter_pack:: template type_from_index_t; static_assert(etl::is_one_of ::value, "Unsupported type"); - construct_in_place_args(data, init, std::forward(args)...); + construct_in_place_args(data, init, etl::forward(args)...); operation = operation_type::value, etl::is_move_constructible::value>::do_operation; } @@ -675,7 +675,7 @@ namespace etl operation(private_variant::Destroy, data, nullptr); - construct_in_place_args(data, std::forward(args)...); + construct_in_place_args(data, etl::forward(args)...); operation = operation_type::value, etl::is_move_constructible::value>::do_operation; diff --git a/include/etl/version.h b/include/etl/version.h index 12592eba..3d86d6ee 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -39,7 +39,7 @@ SOFTWARE. #define ETL_VERSION_MAJOR 20 #define ETL_VERSION_MINOR 14 -#define ETL_VERSION_PATCH 0 +#define ETL_VERSION_PATCH 1 #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH) diff --git a/library.json b/library.json index 990b2d31..e6ec5ef2 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "ETL Embedded Template Library", - "version": "20.14.0", + "version": "20.14.1", "author s": { "name": "John Wellbelove", "email": "john.wellbelove@etlcpp.com" diff --git a/library.properties b/library.properties index 5021b0d1..ec1698a8 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Embedded Template Library ETL -version=20.14.0 +version=20.14.1 author= John Wellbelove maintainer=John Wellbelove license=MIT diff --git a/meson.build b/meson.build index 7d295964..f5ac7c02 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ project('PROJECT_NAME', 'cpp_std=c++17', 'build.cpp_std=c++17', ], meson_version: '>=0.54.0', - version: '20.14.0' + version: '20.14.1' ) ###################### diff --git a/support/Release notes.txt b/support/Release notes.txt index 463015c7..f815aadf 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -1,3 +1,7 @@ +=============================================================================== +20.14.1 +Changed std::forward to etl::forward in etl::variant (variadic) + =============================================================================== 20.14.0 Added a vaiadic version of etl::variant. Usable for C++11 and up. diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj index 24cac775..5f65af23 100644 --- a/test/vs2019/etl.vcxproj +++ b/test/vs2019/etl.vcxproj @@ -7129,4 +7129,4 @@ - \ No newline at end of file +