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

Revert "Resolved #359"

Browse Source 
This reverts commit c97927f242.
This commit is contained in:
kentsangkm 2015-03-26 19:38:07 +08:00
parent c97927f242
commit 463981554d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_capture.hpp
View File

@ -33,7 +33,7 @@
do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
try { \
__catchResult.eval(expr).endExpression(); \
( __catchResult->*expr ).endExpression(); \
} \
catch( ... ) { \
__catchResult.useActiveException( Catch::ResultDisposition::Normal ); \

8
include/internal/catch_result_builder.h
View File

@ -41,8 +41,8 @@ namespace Catch {
ResultDisposition::Flags resultDisposition );
template<typename T>
ExpressionLhs<T const&> eval( T const& operand );
ExpressionLhs<bool> eval( bool value );
ExpressionLhs<T const&> operator->* ( T const& operand );
ExpressionLhs<bool> operator->* ( bool value );
template<typename T>
ResultBuilder& operator << ( T const& value ) {
@ -93,11 +93,11 @@ namespace Catch {
namespace Catch {
template<typename T>
inline ExpressionLhs<T const&> ResultBuilder::eval( T const& operand ) {
inline ExpressionLhs<T const&> ResultBuilder::operator->* ( T const& operand ) {
return ExpressionLhs<T const&>( *this, operand );
}
inline ExpressionLhs<bool> ResultBuilder::eval( bool value ) {
inline ExpressionLhs<bool> ResultBuilder::operator->* ( bool value ) {
return ExpressionLhs<bool>( *this, value );
}

10
single_include/catch.hpp
View File

@ -724,8 +724,8 @@ namespace Catch {
ResultDisposition::Flags resultDisposition );
template<typename T>
ExpressionLhs<T const&> eval( T const& operand );
ExpressionLhs<bool> eval( bool value );
ExpressionLhs<T const&> operator->* ( T const& operand );
ExpressionLhs<bool> operator->* ( bool value );
template<typename T>
ResultBuilder& operator << ( T const& value ) {
@ -1301,11 +1301,11 @@ private:
namespace Catch {
template<typename T>
inline ExpressionLhs<T const&> ResultBuilder::eval( T const& operand ) {
inline ExpressionLhs<T const&> ResultBuilder::operator->* ( T const& operand ) {
return ExpressionLhs<T const&>( *this, operand );
}
inline ExpressionLhs<bool> ResultBuilder::eval( bool value ) {
inline ExpressionLhs<bool> ResultBuilder::operator->* ( bool value ) {
return ExpressionLhs<bool>( *this, value );
}
@ -1475,7 +1475,7 @@ namespace Catch {
do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
try { \
__catchResult.eval(expr).endExpression(); \
( __catchResult->*expr ).endExpression(); \
} \
catch( ... ) { \
__catchResult.useActiveException( Catch::ResultDisposition::Normal ); \