3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolved #359 

Eclipse header indexer did not handle the operator->* correctly. So
rename the function from operator->* to eval can resolve the Eclipse
false alert.
This commit is contained in:
kentsangkm 2015-03-21 16:49:00 +08:00
parent b9ec8a10ed
commit c97927f242
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 { \ do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \ Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
try { \ try { \
( __catchResult->*expr ).endExpression(); \ __catchResult.eval(expr).endExpression(); \
} \ } \
catch( ... ) { \ catch( ... ) { \
__catchResult.useActiveException( Catch::ResultDisposition::Normal ); \ __catchResult.useActiveException( Catch::ResultDisposition::Normal ); \

8
include/internal/catch_result_builder.h
View File

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

10
single_include/catch.hpp
View File

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