eden-emu/Catch2
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Gutted catch_compiler_capabilities

Browse source 
All C++11 toggles are now removed. What is left is either platform
specific (POSIX_SIGNALS, WINDOWS_SEH), or possibly still needed
(USE_COUNTER).

If current CLion is compatible with `__COUNTER__`, then we should also
force `__COUNTER__` usage.

Changed
* CATCH_AUTO_PTR    -> std::unique_ptr
* CATCH_OVERRIDE    -> override
* CATCH_NULL        -> nullptr
* CATCH_NOEXCEPT    -> noexcept
* CATCH_NOEXCEPT_IS -> noexcept

Removed
* CATCH_CONFIG_CPP11_UNIQUE_PTR
* CATCH_CONFIG_CPP11_SHUFFLE
* CATCH_CONFIG_CPP11_TYPE_TRAITS
* CATCH_CONFIG_CPP11_OVERRIDE
* CATCH_CONFIG_CPP11_LONG_LONG
* CATCH_CONFIG_CPP11_TUPLE
* CATCH_CONFIG_CPP11_IS_ENUM
* CATCH_CONFIG_CPP11_GENERATED_METHODS
* CATCH_CONFIG_CPP11_NOEXCEPT
* CATCH_CONFIG_CPP11_NULLPTR
* CATCH_CONFIG_VARIADIC_MACROS
This commit is contained in:
Martin Hořeňovský 2017-04-25 12:41:30 +02:00
parent 97707afae1
commit 71df66365e
53 changed files with 261 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/internal/catch_objc.hpp
View file

@ -72,7 +72,7 @@ namespace Catch {
inline size_t registerTestMethods() {
size_t noTestMethods = 0;
int noClasses = objc_getClassList( CATCH_NULL, 0 );
int noClasses = objc_getClassList( nullptr, 0 );
Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
objc_getClassList( classes, noClasses );
@ -112,7 +112,7 @@ namespace Catch {
arcSafeRelease( m_substr );
}
virtual bool match( NSString* arg ) const CATCH_OVERRIDE {
virtual bool match( NSString* arg ) const override {
return false;
}
@ -122,12 +122,12 @@ namespace Catch {
struct Equals : StringHolder {
Equals( NSString* substr ) : StringHolder( substr ){}
virtual bool match( NSString* str ) const CATCH_OVERRIDE {
virtual bool match( NSString* str ) const override {
return (str != nil || m_substr == nil ) &&
[str isEqualToString:m_substr];
}
virtual std::string describe() const CATCH_OVERRIDE {
virtual std::string describe() const override {
return "equals string: " + Catch::toString( m_substr );
}
};
@ -140,7 +140,7 @@ namespace Catch {
[str rangeOfString:m_substr].location != NSNotFound;
}
virtual std::string describe() const CATCH_OVERRIDE {
virtual std::string describe() const override {
return "contains string: " + Catch::toString( m_substr );
}
};
@ -153,7 +153,7 @@ namespace Catch {
[str rangeOfString:m_substr].location == 0;
}
virtual std::string describe() const CATCH_OVERRIDE {
virtual std::string describe() const override {
return "starts with: " + Catch::toString( m_substr );
}
};
@ -165,7 +165,7 @@ namespace Catch {
[str rangeOfString:m_substr].location == [str length] - [m_substr length];
}
virtual std::string describe() const CATCH_OVERRIDE {
virtual std::string describe() const override {
return "ends with: " + Catch::toString( m_substr );
}
};