Merge pull request #1 from afoster1/master

Need support for Sun Studio 12.1
This commit is contained in:
wiscy
2016-11-29 21:26:06 +01:00
committed by GitHub
4 changed files with 19 additions and 3 deletions

View File

@@ -218,7 +218,12 @@ namespace Catch {
// using messages.end() directly yields compilation error:
std::vector<MessageInfo>::const_iterator itEnd = messages.end();
# ifdef CATCH_INTERNAL_SUNPRO_CC_NON_COMPLIANT_STL
std::size_t N;
std::distance( itMessage, itEnd, N );
# else
const std::size_t N = static_cast<std::size_t>( std::distance( itMessage, itEnd ) );
# endif // CATCH_INTERNAL_SUNPRO_CC_NON_COMPLIANT_STL
{
Colour colourGuard( colour );