Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore function-like semicolon-swallowing behavior to FC_THROW

Browse source
This commit is contained in:
Eric Frias 2014-09-02 15:21:30 -04:00
parent 3222dc7c0b
commit a0b3a9a92d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/fc/exception/exception.hpp
View file

@ -299,11 +299,11 @@ namespace fc
*/ */
#define FC_ASSERT( TEST, ... ) \ #define FC_ASSERT( TEST, ... ) \
FC_EXPAND_MACRO( \ FC_EXPAND_MACRO( \
do { if( !(TEST) ) { FC_THROW_EXCEPTION( fc::assert_exception, #TEST ": " __VA_ARGS__ ); } } while(0); \ do { if( !(TEST) ) { FC_THROW_EXCEPTION( fc::assert_exception, #TEST ": " __VA_ARGS__ ); } } while(0) \
) )
#define FC_CAPTURE_AND_THROW( EXCEPTION_TYPE, ... ) \ #define FC_CAPTURE_AND_THROW( EXCEPTION_TYPE, ... ) \
do { throw EXCEPTION_TYPE( FC_LOG_MESSAGE( error, "", FC_FORMAT_ARG_PARAMS(__VA_ARGS__) ) ); } while(false); do { throw EXCEPTION_TYPE( FC_LOG_MESSAGE( error, "", FC_FORMAT_ARG_PARAMS(__VA_ARGS__) ) ); } while(0)
//#define FC_THROW( FORMAT, ... ) //#define FC_THROW( FORMAT, ... )
// FC_INDIRECT_EXPAND workas around a bug in Visual C++ variadic macro processing that prevents it // FC_INDIRECT_EXPAND workas around a bug in Visual C++ variadic macro processing that prevents it
@ -335,7 +335,7 @@ namespace fc
do { \ do { \
ER.append_log( FC_LOG_MESSAGE( LOG_LEVEL, FORMAT, __VA_ARGS__ ) ); \ ER.append_log( FC_LOG_MESSAGE( LOG_LEVEL, FORMAT, __VA_ARGS__ ) ); \
throw;\ throw;\
} while(false) } while(0)
#define FC_LOG_AND_RETHROW( ) \ #define FC_LOG_AND_RETHROW( ) \
catch( fc::exception& er ) { \ catch( fc::exception& er ) { \