coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-10-28 18:07:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/#799-Iterator-returned-by-crc.input()-does-not-satisfy-std--output_iterator' into development

Browse Source
This commit is contained in:
John Wellbelove 2023-12-08 08:46:34 +00:00
commit 9161413337
4 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/etl/frame_check_sequence.h
View File

@ -1,6 +1,4 @@
///\file
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
@ -48,13 +46,13 @@ namespace etl
/// add_insert_iterator
/// An output iterator used to add new values.
//***************************************************
template <typename TFCS>
class add_insert_iterator : public etl::iterator<ETL_OR_STD::output_iterator_tag, void, void, void, void>
template <typename TFrame_Check_Sequence>
class add_insert_iterator : public etl::iterator<ETL_OR_STD::output_iterator_tag, typename TFrame_Check_Sequence::value_type>
{
public:
//***********************************
explicit add_insert_iterator(TFCS& fcs) ETL_NOEXCEPT
explicit add_insert_iterator(TFrame_Check_Sequence& fcs) ETL_NOEXCEPT
: p_fcs(&fcs)
{
}
@ -78,7 +76,7 @@ namespace etl
}
//***********************************
add_insert_iterator& operator =(uint8_t value)
add_insert_iterator& operator =(typename TFrame_Check_Sequence::value_type value)
{
p_fcs->add(value);
return *this;
@ -86,7 +84,7 @@ namespace etl
private:
TFCS* p_fcs;
TFrame_Check_Sequence* p_fcs;
};
}

10
include/etl/pseudo_moving_average.h
View File

@ -42,13 +42,13 @@ namespace etl
/// add_insert_iterator
/// An output iterator used to add new values.
//***************************************************
template <typename TCMA>
class add_insert_iterator : public etl::iterator<ETL_OR_STD::output_iterator_tag, void, void, void, void>
template <typename TPseudo_Moving_Average>
class add_insert_iterator : public etl::iterator<ETL_OR_STD::output_iterator_tag, typename TPseudo_Moving_Average::value_type, void, void, void>
{
public:
//***********************************
explicit add_insert_iterator(TCMA& pma) ETL_NOEXCEPT
explicit add_insert_iterator(TPseudo_Moving_Average& pma) ETL_NOEXCEPT
: p_pma(&pma)
{
}
@ -72,7 +72,7 @@ namespace etl
}
//***********************************
add_insert_iterator& operator =(typename TCMA::value_type value)
add_insert_iterator& operator =(typename TPseudo_Moving_Average::value_type value)
{
p_pma->add(value);
return *this;
@ -80,7 +80,7 @@ namespace etl
private:
TCMA* p_pma;
TPseudo_Moving_Average* p_pma;
};
}

18
test/run-syntax-checks.sh
View File

@ -12,7 +12,7 @@ NoColour='\033[0m'
ParseGitBranch()
{
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
git rev-parse --abbrev-ref HEAD
}
SetCxxStandard()
@ -29,12 +29,12 @@ PrintHeader()
{
echo "$TitleColour"
echo "============================================================================" | tee -a log.txt
echo " Configuration : $configuration_name " | tee -a log.txt
echo " Compiler : $compiler " | tee -a log.txt
echo " Language standard : C++$cxx_standard " | tee -a log.txt
echo " ETL version : $etl_version " | tee -a log.txt
echo " Git branch : $(ParseGitBranch) " | tee -a log.txt
echo " Processes : ${CMAKE_BUILD_PARALLEL_LEVEL} " | tee -a log.txt
echo " Configuration : $configuration_name" | tee -a log.txt
echo " Compiler : $compiler " | tee -a log.txt
echo " Language standard : C++$cxx_standard " | tee -a log.txt
echo " ETL version : $etl_version " | tee -a log.txt
echo " Git branch : $(ParseGitBranch) " | tee -a log.txt
echo " Processes : ${CMAKE_BUILD_PARALLEL_LEVEL}" | tee -a log.txt
echo "============================================================================" | tee -a log.txt
echo "$NoColour"
}
@ -43,7 +43,7 @@ PassedCompilation()
{
echo "$PassColour"
echo "-----------------------------------------------" | tee -a log.txt
echo " Passed Compilation - $testname " | tee -a log.txt
echo " Passed Compilation - $configuration_name" | tee -a log.txt
echo "-----------------------------------------------" | tee -a log.txt
echo "$NoColour"
}
@ -52,7 +52,7 @@ FailedCompilation()
{
echo "$FailColour"
echo "****************************************************************************" | tee -a log.txt
echo "**** Failed Compilation $testname " | tee -a log.txt
echo "**** Failed Compilation $configuration_name" | tee -a log.txt
echo "****************************************************************************" | tee -a log.txt
echo "$NoColour"
}

26
test/run-tests.sh
View File

@ -21,7 +21,7 @@ NoColour='\033[0m'
ParseGitBranch()
{
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
git rev-parse --abbrev-ref HEAD
}
SetConfigurationName()
@ -38,14 +38,14 @@ PrintHeader()
{
echo "$TitleColour"
echo "============================================================================" | tee -a log.txt
echo " Configuration : $configuration_name " | tee -a log.txt
echo " Compiler : $compiler " | tee -a log.txt
echo " Language standard : C++$cxx_standard " | tee -a log.txt
echo " Optimisation : $opt " | tee -a log.txt
echo " Sanitizer : $sanitize " | tee -a log.txt
echo " ETL version : $etl_version " | tee -a log.txt
echo " Git branch : $(ParseGitBranch) " | tee -a log.txt
echo " Processes : ${CMAKE_BUILD_PARALLEL_LEVEL} " | tee -a log.txt
echo " Configuration : $configuration_name" | tee -a log.txt
echo " Compiler : $compiler " | tee -a log.txt
echo " Language standard : C++$cxx_standard " | tee -a log.txt
echo " Optimisation : $opt " | tee -a log.txt
echo " Sanitizer : $sanitize " | tee -a log.txt
echo " ETL version : $etl_version " | tee -a log.txt
echo " Git branch : $(ParseGitBranch) " | tee -a log.txt
echo " Processes : ${CMAKE_BUILD_PARALLEL_LEVEL}" | tee -a log.txt
echo "============================================================================" | tee -a log.txt
echo "$NoColour"
}
@ -67,7 +67,7 @@ PassedCompilation()
{
echo "$PassColour"
echo "-----------------------------------------------" | tee -a log.txt
echo " Passed Compilation - $testname " | tee -a log.txt
echo " Passed Compilation - $configuration_name" | tee -a log.txt
echo "-----------------------------------------------" | tee -a log.txt
echo "$NoColour"
}
@ -76,7 +76,7 @@ PassedTests()
{
echo "$PassColour"
echo "-----------------------------------------------" | tee -a log.txt
echo " Passed Tests - $testname " | tee -a log.txt
echo " Passed Tests - $configuration_name" | tee -a log.txt
echo "-----------------------------------------------" | tee -a log.txt
echo "$NoColour"
}
@ -85,7 +85,7 @@ FailedCompilation()
{
echo "$FailColour"
echo "****************************************************************************" | tee -a log.txt
echo "**** Failed Compilation $testname " | tee -a log.txt
echo "**** Failed Compilation - $configuration_name" | tee -a log.txt
echo "****************************************************************************" | tee -a log.txt
echo "$NoColour"
Bell
@ -95,7 +95,7 @@ FailedTests()
{
echo "$FailColour"
echo "****************************************************************************" | tee -a log.txt
echo "**** Failed Tests $testname " | tee -a log.txt
echo "**** Failed Tests - $configuration_name" | tee -a log.txt
echo "****************************************************************************" | tee -a log.txt
echo "$NoColour"
Bell