mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 13:26:10 +01:00
Removed SafeBool
This commit is contained in:
parent
e1bca7017d
commit
cc8206f4c3
@ -44,17 +44,6 @@ namespace Catch {
|
||||
virtual ~NonCopyable();
|
||||
};
|
||||
|
||||
class SafeBool {
|
||||
public:
|
||||
typedef void (SafeBool::*type)() const;
|
||||
|
||||
static type makeSafe( bool value ) {
|
||||
return value ? &SafeBool::trueValue : 0;
|
||||
}
|
||||
private:
|
||||
void trueValue() const {}
|
||||
};
|
||||
|
||||
template<typename ContainerT>
|
||||
inline void deleteAll( ContainerT& container ) {
|
||||
for( auto p : container )
|
||||
|
@ -61,8 +61,8 @@ namespace Catch {
|
||||
bool none() const { return nullableValue == nullptr; }
|
||||
|
||||
bool operator !() const { return nullableValue == nullptr; }
|
||||
operator SafeBool::type() const {
|
||||
return SafeBool::makeSafe( some() );
|
||||
explicit operator bool() const {
|
||||
return some();
|
||||
}
|
||||
|
||||
private:
|
||||
|
@ -56,7 +56,7 @@ namespace Catch {
|
||||
T& operator*() const { return *m_p; }
|
||||
T* operator->() const { return m_p; }
|
||||
bool operator !() const { return m_p == nullptr; }
|
||||
operator SafeBool::type() const { return SafeBool::makeSafe( m_p != nullptr ); }
|
||||
explicit operator bool() const { return m_p != nullptr; }
|
||||
|
||||
private:
|
||||
T* m_p;
|
||||
|
@ -293,8 +293,8 @@ struct Boolable
|
||||
{
|
||||
explicit Boolable( bool value ) : m_value( value ) {}
|
||||
|
||||
operator Catch::SafeBool::type() const {
|
||||
return Catch::SafeBool::makeSafe( m_value );
|
||||
explicit operator bool() const {
|
||||
return m_value;
|
||||
}
|
||||
|
||||
bool m_value;
|
||||
|
Loading…
Reference in New Issue
Block a user