eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-05-25 14:09:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed use of compiler specific techniques for denoting non-returning functions

Browse source 
- use if( Catch::isTrue( true) ) to guard throws instead
This commit is contained in:
Phil Nash 2013-04-23 20:52:49 +01:00
parent 2a9d8d9e36
commit bf37e6879a
6 changed files with 35 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/internal/catch_common.h
View file

@ -15,16 +15,12 @@
#define INTERNAL_CATCH_STRINGIFY2( expr ) #expr
#define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr )
#ifdef __GNUC__
#define CATCH_ATTRIBUTE_NORETURN __attribute__ ((noreturn))
#else
#define CATCH_ATTRIBUTE_NORETURN
#endif
#include <sstream>
#include <stdexcept>
#include <algorithm>
#include "catch_compiler_capabilities.h"
namespace Catch {
class NonCopyable {
@ -134,11 +130,14 @@ namespace Catch {
return os;
}
CATCH_ATTRIBUTE_NORETURN
// This is just here to avoid compiler warnings with macro constants and boolean literals
inline bool isTrue( bool value ){ return value; }
inline void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) {
std::ostringstream oss;
oss << locationInfo << ": Internal Catch error: '" << message << "'";
throw std::logic_error( oss.str() );
if( isTrue( true ))
throw std::logic_error( oss.str() );
}
}