3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-17 19:22:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed std::distance compile error with Oracle Solaris Studio 12.1

Browse Source 
Building Catch with Oracle Solaris Studio 12.1 generates an error when calling
std::distance due to the toolchains non-compliant STL implementation.  This
implementation returns its result via an output parameter rather than a return
value.
This commit is contained in:
Andrew Foster 2016-10-10 11:34:19 +01:00
parent 87803cdd2d
commit 1f97d4d318
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/catch_compiler_capabilities.h
View File

@ -119,6 +119,16 @@
#endif // _MSC_VER #endif // _MSC_VER
////////////////////////////////////////////////////////////////////////////////
// Oracle Solaris Studio
#ifdef __SUNPRO_CC
# if __SUNPRO_CC == 0x5100 // Oracle Solaris Studio version 12.1
# define CATCH_INTERNAL_SUNPRO_CC_NON_COMPLIANT_STL
# endif
#endif // __SUNPRO_CC
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Use variadic macros if the compiler supports them // Use variadic macros if the compiler supports them

5
include/reporters/catch_reporter_compact.hpp
View File

@ -218,7 +218,12 @@ namespace Catch {
// using messages.end() directly yields compilation error: // using messages.end() directly yields compilation error:
std::vector<MessageInfo>::const_iterator itEnd = messages.end(); 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 ) ); 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 ); Colour colourGuard( colour );