From 3b04e715115b29045fcf5bf8e1c36bac424c59e0 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Tue, 20 Oct 2020 11:14:37 +0100 Subject: [PATCH] ETL_CONSTANT --- include/etl/basic_format_spec.h | 24 ++++++++++++------------ include/etl/iterator.h | 20 ++++++++++---------- include/etl/span.h | 4 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/etl/basic_format_spec.h b/include/etl/basic_format_spec.h index 60576ef9..d5a885ff 100644 --- a/include/etl/basic_format_spec.h +++ b/include/etl/basic_format_spec.h @@ -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 diff --git a/include/etl/iterator.h b/include/etl/iterator.h index 6e323d9a..49766db4 100644 --- a/include/etl/iterator.h +++ b/include/etl/iterator.h @@ -607,37 +607,37 @@ namespace etl template struct is_input_iterator { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same::iterator_category, ETL_OR_STD::input_iterator_tag>::value; + static ETL_CONSTANT bool value = etl::is_same::iterator_category, ETL_OR_STD::input_iterator_tag>::value; }; template struct is_output_iterator { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same::iterator_category, ETL_OR_STD::output_iterator_tag>::value; + static ETL_CONSTANT bool value = etl::is_same::iterator_category, ETL_OR_STD::output_iterator_tag>::value; }; template struct is_forward_iterator { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same::iterator_category, ETL_OR_STD::forward_iterator_tag>::value; + static ETL_CONSTANT bool value = etl::is_same::iterator_category, ETL_OR_STD::forward_iterator_tag>::value; }; template struct is_bidirectional_iterator { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same::iterator_category, ETL_OR_STD::bidirectional_iterator_tag>::value; + static ETL_CONSTANT bool value = etl::is_same::iterator_category, ETL_OR_STD::bidirectional_iterator_tag>::value; }; template struct is_random_iterator { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_same::iterator_category, ETL_OR_STD::random_access_iterator_tag>::value; + static ETL_CONSTANT bool value = etl::is_same::iterator_category, ETL_OR_STD::random_access_iterator_tag>::value; }; template struct is_input_iterator_concept { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_input_iterator::value || + static ETL_CONSTANT bool value = etl::is_input_iterator::value || etl::is_forward_iterator::value || etl::is_bidirectional_iterator::value || etl::is_random_iterator::value; @@ -646,7 +646,7 @@ namespace etl template struct is_output_iterator_concept { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_output_iterator::value || + static ETL_CONSTANT bool value = etl::is_output_iterator::value || etl::is_forward_iterator::value || etl::is_bidirectional_iterator::value || etl::is_random_iterator::value; @@ -655,7 +655,7 @@ namespace etl template struct is_forward_iterator_concept { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_forward_iterator::value || + static ETL_CONSTANT bool value = etl::is_forward_iterator::value || etl::is_bidirectional_iterator::value || etl::is_random_iterator::value; }; @@ -663,14 +663,14 @@ namespace etl template struct is_bidirectional_iterator_concept { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_bidirectional_iterator::value || + static ETL_CONSTANT bool value = etl::is_bidirectional_iterator::value || etl::is_random_iterator::value; }; template struct is_random_iterator_concept { - static ETL_CONST_OR_CONSTEXPR bool value = etl::is_random_iterator::value; + static ETL_CONSTANT bool value = etl::is_random_iterator::value; }; } diff --git a/include/etl/span.h b/include/etl/span.h index 89e4cf2f..ae3d3781 100644 --- a/include/etl/span.h +++ b/include/etl/span.h @@ -49,7 +49,7 @@ SOFTWARE. namespace etl { - static ETL_CONST_OR_CONSTEXPR size_t dynamic_extent = etl::integral_limits::max; + static ETL_CONSTANT size_t dynamic_extent = etl::integral_limits::max; //*************************************************************************** /// Array view. @@ -71,7 +71,7 @@ namespace etl typedef ETL_OR_STD::reverse_iterator reverse_iterator; typedef ETL_OR_STD::reverse_iterator const_reverse_iterator; - static ETL_CONST_OR_CONSTEXPR size_t extent = EXTENT; + static ETL_CONSTANT size_t extent = EXTENT; //************************************************************************* /// Default constructor.