ETL_CONSTANT

This commit is contained in:
John Wellbelove 2020-10-20 11:14:37 +01:00
parent 0c99ef5282
commit 3b04e71511
3 changed files with 24 additions and 24 deletions

View File

@ -160,40 +160,40 @@ namespace etl
}
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::base_spec bin = { 2U };
static ETL_CONSTANT private_basic_format_spec::base_spec bin = { 2U };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::base_spec oct = { 8U };
static ETL_CONSTANT private_basic_format_spec::base_spec oct = { 8U };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::base_spec dec = { 10U };
static ETL_CONSTANT private_basic_format_spec::base_spec dec = { 10U };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::base_spec hex = { 16U };
static ETL_CONSTANT private_basic_format_spec::base_spec hex = { 16U };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::left_spec left;
static ETL_CONSTANT private_basic_format_spec::left_spec left;
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::right_spec right;
static ETL_CONSTANT private_basic_format_spec::right_spec right;
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::boolalpha_spec boolalpha = { true };
static ETL_CONSTANT private_basic_format_spec::boolalpha_spec boolalpha = { true };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::boolalpha_spec noboolalpha = { false };
static ETL_CONSTANT private_basic_format_spec::boolalpha_spec noboolalpha = { false };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::uppercase_spec uppercase = { true };
static ETL_CONSTANT private_basic_format_spec::uppercase_spec uppercase = { true };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::uppercase_spec nouppercase = { false };
static ETL_CONSTANT private_basic_format_spec::uppercase_spec nouppercase = { false };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::showbase_spec showbase = { true };
static ETL_CONSTANT private_basic_format_spec::showbase_spec showbase = { true };
//*********************************
static ETL_CONST_OR_CONSTEXPR private_basic_format_spec::showbase_spec noshowbase = { false };
static ETL_CONSTANT private_basic_format_spec::showbase_spec noshowbase = { false };
//***************************************************************************
/// basic_format_spec

View File

@ -607,37 +607,37 @@ namespace etl
template <typename T>
struct is_input_iterator
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::input_iterator_tag>::value;
static ETL_CONSTANT bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::input_iterator_tag>::value;
};
template <typename T>
struct is_output_iterator
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::output_iterator_tag>::value;
static ETL_CONSTANT bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::output_iterator_tag>::value;
};
template <typename T>
struct is_forward_iterator
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::forward_iterator_tag>::value;
static ETL_CONSTANT bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::forward_iterator_tag>::value;
};
template <typename T>
struct is_bidirectional_iterator
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::bidirectional_iterator_tag>::value;
static ETL_CONSTANT bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::bidirectional_iterator_tag>::value;
};
template <typename T>
struct is_random_iterator
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::random_access_iterator_tag>::value;
static ETL_CONSTANT bool value = etl::is_same<typename etl::iterator_traits<T>::iterator_category, ETL_OR_STD::random_access_iterator_tag>::value;
};
template <typename T>
struct is_input_iterator_concept
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_input_iterator<T>::value ||
static ETL_CONSTANT bool value = etl::is_input_iterator<T>::value ||
etl::is_forward_iterator<T>::value ||
etl::is_bidirectional_iterator<T>::value ||
etl::is_random_iterator<T>::value;
@ -646,7 +646,7 @@ namespace etl
template <typename T>
struct is_output_iterator_concept
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_output_iterator<T>::value ||
static ETL_CONSTANT bool value = etl::is_output_iterator<T>::value ||
etl::is_forward_iterator<T>::value ||
etl::is_bidirectional_iterator<T>::value ||
etl::is_random_iterator<T>::value;
@ -655,7 +655,7 @@ namespace etl
template <typename T>
struct is_forward_iterator_concept
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_forward_iterator<T>::value ||
static ETL_CONSTANT bool value = etl::is_forward_iterator<T>::value ||
etl::is_bidirectional_iterator<T>::value ||
etl::is_random_iterator<T>::value;
};
@ -663,14 +663,14 @@ namespace etl
template <typename T>
struct is_bidirectional_iterator_concept
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_bidirectional_iterator<T>::value ||
static ETL_CONSTANT bool value = etl::is_bidirectional_iterator<T>::value ||
etl::is_random_iterator<T>::value;
};
template <typename T>
struct is_random_iterator_concept
{
static ETL_CONST_OR_CONSTEXPR bool value = etl::is_random_iterator<T>::value;
static ETL_CONSTANT bool value = etl::is_random_iterator<T>::value;
};
}

View File

@ -49,7 +49,7 @@ SOFTWARE.
namespace etl
{
static ETL_CONST_OR_CONSTEXPR size_t dynamic_extent = etl::integral_limits<size_t>::max;
static ETL_CONSTANT size_t dynamic_extent = etl::integral_limits<size_t>::max;
//***************************************************************************
/// Array view.
@ -71,7 +71,7 @@ namespace etl
typedef ETL_OR_STD::reverse_iterator<iterator> reverse_iterator;
typedef ETL_OR_STD::reverse_iterator<const_iterator> const_reverse_iterator;
static ETL_CONST_OR_CONSTEXPR size_t extent = EXTENT;
static ETL_CONSTANT size_t extent = EXTENT;
//*************************************************************************
/// Default constructor.