coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-16 00:46:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
# Conflicts:
#	include/etl/version.h
#	library.json
#	library.properties
#	meson.build
This commit is contained in:
John Wellbelove 2021-08-01 19:43:42 +01:00
commit 8986f80cb0
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/etl/private/variant_variadic.h
View File

@ -536,7 +536,7 @@ namespace etl
{
static_assert(etl::is_one_of<etl::remove_reference_t<T>, TTypes...>::value, "Unsupported type");
construct_in_place<etl::remove_reference_t<T>>(data, std::forward<T>(value));
construct_in_place<etl::remove_reference_t<T>>(data, etl::forward<T>(value));
}
//***************************************************************************
@ -550,7 +550,7 @@ namespace etl
{
static_assert(etl::is_one_of<etl::remove_reference_t<T>, TTypes...>::value, "Unsupported type");
construct_in_place_args<etl::remove_reference_t<T>>(data, std::forward<TArgs>(args)...);
construct_in_place_args<etl::remove_reference_t<T>>(data, etl::forward<TArgs>(args)...);
}
//***************************************************************************
@ -564,7 +564,7 @@ namespace etl
using type = typename private_variant::parameter_pack<TTypes...>:: template type_from_index_t<Index>;
static_assert(etl::is_one_of<type, TTypes...> ::value, "Unsupported type");
construct_in_place_args<type>(data, std::forward<TArgs>(args)...);
construct_in_place_args<type>(data, etl::forward<TArgs>(args)...);
operation = operation_type<type, etl::is_copy_constructible<type>::value, etl::is_move_constructible<type>::value>::do_operation;
}
@ -581,7 +581,7 @@ namespace etl
{
static_assert(etl::is_one_of<etl::remove_reference_t<T>, TTypes...> ::value, "Unsupported type");
construct_in_place_args<etl::remove_reference_t<T>>(data, init, std::forward<TArgs>(args)...);
construct_in_place_args<etl::remove_reference_t<T>>(data, init, etl::forward<TArgs>(args)...);
}
//***************************************************************************
@ -595,7 +595,7 @@ namespace etl
using type = typename private_variant::parameter_pack<TTypes...>:: template type_from_index_t<Index>;
static_assert(etl::is_one_of<type, TTypes...> ::value, "Unsupported type");
construct_in_place_args<type>(data, init, std::forward<TArgs>(args)...);
construct_in_place_args<type>(data, init, etl::forward<TArgs>(args)...);
operation = operation_type<type, etl::is_copy_constructible<type>::value, etl::is_move_constructible<type>::value>::do_operation;
}
@ -675,7 +675,7 @@ namespace etl
operation(private_variant::Destroy, data, nullptr);
construct_in_place_args<type>(data, std::forward<TArgs>(args)...);
construct_in_place_args<type>(data, etl::forward<TArgs>(args)...);
operation = operation_type<type, etl::is_copy_constructible<type>::value, etl::is_move_constructible<type>::value>::do_operation;

2
include/etl/version.h
View File

@ -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)

2
library.json
View File

@ -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"

2
library.properties
View File

@ -1,5 +1,5 @@
name=Embedded Template Library ETL
version=20.14.0
version=20.14.1
author= John Wellbelove <john.wellbelove@etlcpp.com>
maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
license=MIT

2
meson.build
View File

@ -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'
)
######################

4
support/Release notes.txt
View File

@ -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.

2
test/vs2019/etl.vcxproj
View File

@ -7129,4 +7129,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>