Incorporated Clara with TextFlow fix for assertion with consecutive newlines

fixes #1012
This commit is contained in:
Phil Nash 2017-08-31 16:14:27 +01:00
parent 3a5b951256
commit 115db71bab

View File

@ -135,7 +135,7 @@ namespace Catch { namespace clara { namespace TextFlow {
auto operator *() const -> std::string { auto operator *() const -> std::string {
assert( m_stringIndex < m_column.m_strings.size() ); assert( m_stringIndex < m_column.m_strings.size() );
assert( m_pos < m_end ); assert( m_pos <= m_end );
if( m_pos + m_column.m_width < m_end ) if( m_pos + m_column.m_width < m_end )
return addIndentAndSuffix(line().substr(m_pos, m_len)); return addIndentAndSuffix(line().substr(m_pos, m_len));
else else