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

Merge branch 'hotfix/fix-c++03-incompatbilities-in-type-traits' into development

Browse Source
This commit is contained in:
John Wellbelove 2020-05-27 12:12:54 +01:00
commit 18d0b3dd5b
11 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -256,3 +256,4 @@ build-test-Desktop_x86_windows_msvc2017_pe_32bit-Debug
test/Logs
build-test-Desktop_x86_windows_msvc2019_pe_32bit-Debug
test/vs2019/.vs
Corel Auto-Preserve

2
README.md
View File

@ -2,7 +2,7 @@ Embedded Template Library (ETL)
-------------------------
[![Build status](https://ci.appveyor.com/api/projects/status/b7jgecv7unqjw4u0/branch/master?svg=true)](https://ci.appveyor.com/project/jwellbelove/etl/branch/master)
[![ETLCPP](https://circleci.com/gh/ETLCPP/etl.svg?style=svg)](https://app.circleci.com/pipelines/github/ETLCPP/etl)
[![ETLCPP](https://circleci.com/gh/ETLCPP/etl.svg?style=shield)](https://app.circleci.com/pipelines/github/ETLCPP/etl)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/3c14cd918ccf40008d0bcd7b083d5946)](https://www.codacy.com/manual/jwellbelove/etl?utm_source=github.com&utm_medium=referral&utm_content=ETLCPP/etl&utm_campaign=Badge_Grade)
![GitHub release (latest by date)](https://img.shields.io/github/v/release/jwellbelove/etl)
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)

BIN
etl-patreon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
etl-social.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

6
include/etl/generators/type_traits_generator.h
View File

@ -114,6 +114,9 @@ namespace etl
#if ETL_CPP11_SUPPORTED
template <bool B>
using bool_constant = integral_constant<bool, B>;
#else
template <bool B>
struct bool_constant : etl::integral_constant<bool, B> { };
#endif
//***************************************************************************
@ -799,6 +802,9 @@ namespace etl
#if ETL_CPP17_SUPPORTED
template <bool B>
using bool_constant = std::bool_constant<B>;
#else
template <bool B>
struct bool_constant : std::integral_constant<bool, B> { };
#endif
//***************************************************************************

6
include/etl/type_traits.h
View File

@ -102,6 +102,9 @@ namespace etl
#if ETL_CPP11_SUPPORTED
template <bool B>
using bool_constant = integral_constant<bool, B>;
#else
template <bool B>
struct bool_constant : etl::integral_constant<bool, B> { };
#endif
//***************************************************************************
@ -787,6 +790,9 @@ namespace etl
#if ETL_CPP17_SUPPORTED
template <bool B>
using bool_constant = std::bool_constant<B>;
#else
template <bool B>
struct bool_constant : std::integral_constant<bool, B> { };
#endif
//***************************************************************************

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 18
#define ETL_VERSION_MINOR 3
#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": "Embedded Template Library",
"version": "18.3.0",
"version": "18.3.1",
"authors": {
"name": "John Wellbelove",
"email": "john.wellbelove@etlcpp.com"

2
library.properties
View File

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

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
18.3.1
C++03 compatibility fix for type_traits.h
===============================================================================
18.3.0
Added etl::parameter_pack to easily extract information about the types in a

29
test/test_type_traits.cpp
View File

@ -737,7 +737,7 @@ namespace
};
//*************************************************************************
TEST(conditional_integral_constant)
TEST(test_conditional_integral_constant)
{
int v1 = etl::conditional_integral_constant<true, int, 1, 2>::value;
int v2 = etl::conditional_integral_constant<false, int, 1, 2>::value;
@ -747,7 +747,7 @@ namespace
}
//*************************************************************************
TEST(size_of)
TEST(test_size_of)
{
CHECK_EQUAL(1, etl::size_of<void>::value);
CHECK_EQUAL(1, etl::size_of<char>::value);
@ -763,7 +763,7 @@ namespace
}
//*************************************************************************
TEST(is_convertible)
TEST(test_is_convertible)
{
CHECK((etl::is_convertible<char, int>::value));
CHECK((etl::is_convertible<int, char>::value));
@ -779,7 +779,7 @@ namespace
}
//*************************************************************************
TEST(add_lvalue_reference)
TEST(test_add_lvalue_reference)
{
CHECK(!std::is_lvalue_reference_v<etl::add_lvalue_reference<void>::type>);
CHECK(std::is_lvalue_reference_v<etl::add_lvalue_reference<int>::type>);
@ -789,7 +789,7 @@ namespace
}
//*************************************************************************
TEST(add_rvalue_reference)
TEST(test_add_rvalue_reference)
{
CHECK(!std::is_rvalue_reference_v<etl::add_rvalue_reference<void>::type>);
CHECK(std::is_rvalue_reference_v<etl::add_rvalue_reference<int>::type>);
@ -799,7 +799,7 @@ namespace
}
//*************************************************************************
TEST(is_lvalue_reference)
TEST(test_is_lvalue_reference)
{
CHECK_EQUAL(std::is_lvalue_reference_v<void>, etl::is_lvalue_reference_v<void>);
CHECK_EQUAL(std::is_lvalue_reference_v<int>, etl::is_lvalue_reference_v<int>);
@ -809,7 +809,7 @@ namespace
}
//*************************************************************************
TEST(is_rvalue_reference)
TEST(test_is_rvalue_reference)
{
CHECK_EQUAL(std::is_rvalue_reference_v<void>, etl::is_rvalue_reference_v<void>);
CHECK_EQUAL(std::is_rvalue_reference_v<int>, etl::is_rvalue_reference_v<int>);
@ -817,4 +817,19 @@ namespace
CHECK_EQUAL(std::is_rvalue_reference_v<int&>, etl::is_rvalue_reference_v<int&>);
CHECK_EQUAL(std::is_rvalue_reference_v<int&&>, etl::is_rvalue_reference_v<int&&>);
}
//*************************************************************************
TEST(test_integral_constants)
{
CHECK_EQUAL(1, (etl::integral_constant<int, 1>::value));
CHECK((std::is_same_v<int, etl::integral_constant<int, 1>::value_type>));
CHECK_EQUAL(false, (etl::bool_constant<false>::value));
CHECK_EQUAL(true, (etl::bool_constant<true>::value));
CHECK((std::is_same_v<bool, etl::bool_constant<true>::value_type>));
CHECK_EQUAL(true, etl::negation_v<etl::bool_constant<false>>);
CHECK_EQUAL(false, etl::negation_v<etl::bool_constant<true>>);
CHECK((std::is_same_v<bool, etl::bool_constant<true>::value_type>));
}
}