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

SunStudio 12.3 support: variadic macros

Browse Source
This commit is contained in:
Wiscy 2016-11-30 20:12:31 +01:00 committed by Wiscy
parent d89dc2d5ad
commit 941f8de99a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_compiler_capabilities.h
View File

@ -123,8 +123,10 @@
// Oracle Solaris Studio // Oracle Solaris Studio
#ifdef __SUNPRO_CC #ifdef __SUNPRO_CC
# if __SUNPRO_CC == 0x5100 // Oracle Solaris Studio version 12.1 #define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
#define CATCH_INTERNAL_SUNPRO_CC_NON_COMPLIANT_STL #define CATCH_INTERNAL_SUNPRO_CC_NON_COMPLIANT_STL
// OK with __SUNPRO_CC 0x5120
# if __SUNPRO_CC == 0x5100 // Oracle Solaris Studio version 12.1
# endif # endif
#endif // __SUNPRO_CC #endif // __SUNPRO_CC

2
projects/SelfTest/ToStringPair.cpp
View File

@ -30,7 +30,7 @@ TEST_CASE( "std::pair<int,const std::string> -> toString", "[toString][pair]" )
TEST_CASE( "std::vector<std::pair<std::string,int> > -> toString", "[toString][pair]" ) { TEST_CASE( "std::vector<std::pair<std::string,int> > -> toString", "[toString][pair]" ) {
std::vector<std::pair<std::string,int> > pr; std::vector<std::pair<std::string,int> > pr;
pr.push_back( std::make_pair("green", 55 ) ); pr.push_back( std::make_pair(std::string("green"), 55 ) );
REQUIRE( Catch::toString( pr ) == "{ { \"green\", 55 } }" ); REQUIRE( Catch::toString( pr ) == "{ { \"green\", 55 } }" );
} }