Skip to content

Resolved #359 - Eclipse CDT - Method 'endExpression' could not be resolved #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kentsangkm wants to merge 3 commits into from
Closed

Resolved #359 - Eclipse CDT - Method 'endExpression' could not be resolved #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c97927f
Resolved #359
Mar 21, 2015
4639815
Revert "Resolved #359"
Mar 26, 2015
9b3189f
Resolved #359
Mar 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/internal/catch_capture.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
do { \
Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #expr, resultDisposition ); \
try { \
( __catchResult->*expr ).endExpression(); \
( __catchResult+expr ).endExpression(); \
} \
catch( ... ) { \
__catchResult.useActiveException( Catch::ResultDisposition::Normal ); \
Expand Down
8 changes: 4 additions & 4 deletions include/internal/catch_result_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ namespace Catch {
ResultDisposition::Flags resultDisposition );

template<typename T>
ExpressionLhs<T const&> operator->* ( T const& operand );
ExpressionLhs<bool> operator->* ( bool value );
ExpressionLhs<T const&> operator+ ( T const& operand );
ExpressionLhs<bool> operator+ ( bool value );

template<typename T>
ResultBuilder& operator << ( T const& value ) {
Expand Down Expand Up @@ -93,11 +93,11 @@ namespace Catch {
namespace Catch {

template<typename T>
inline ExpressionLhs<T const&> ResultBuilder::operator->* ( T const& operand ) {
inline ExpressionLhs<T const&> ResultBuilder::operator+ ( T const& operand ) {
return ExpressionLhs<T const&>( *this, operand );
}

inline ExpressionLhs<bool> ResultBuilder::operator->* ( bool value ) {
inline ExpressionLhs<bool> ResultBuilder::operator+ ( bool value ) {
return ExpressionLhs<bool>( *this, value );
}

Expand Down
10 changes: 5 additions & 5 deletions single_include/catch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,8 +724,8 @@ namespace Catch {
ResultDisposition::Flags resultDisposition );

template<typename T>
ExpressionLhs<T const&> operator->* ( T const& operand );
ExpressionLhs<bool> operator->* ( bool value );
ExpressionLhs<T const&> operator+ ( T const& operand );
ExpressionLhs<bool> operator+ ( bool value );

template<typename T>
ResultBuilder& operator << ( T const& value ) {
Expand Down Expand Up @@ -1301,11 +1301,11 @@ class ExpressionLhs {
namespace Catch {

template<typename T>
inline ExpressionLhs<T const&> ResultBuilder::operator->* ( T const& operand ) {
inline ExpressionLhs<T const&> ResultBuilder::operator+ ( T const& operand ) {
return ExpressionLhs<T const&>( *this, operand );
}

inline ExpressionLhs<bool> ResultBuilder::operator->* ( bool value ) {
inline ExpressionLhs<bool> ResultBuilder::operator+ ( bool value ) {
return ExpressionLhs<bool>( *this, value );
}

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