3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add non-empty assertion to Option's deref op

Browse Source
This commit is contained in:
Martin Hořeňovský 2021-10-05 19:22:22 +02:00
parent 48a889859b
commit c6c46a168f
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/catch2/internal/catch_option.hpp
View File

@ -46,10 +46,22 @@ namespace Catch {
nullableValue = nullptr; nullableValue = nullptr;
} }
T& operator*() { return *nullableValue; } T& operator*() {
T const& operator*() const { return *nullableValue; } assert(nullableValue);
T* operator->() { return nullableValue; } return *nullableValue;
const T* operator->() const { return nullableValue; } }
T const& operator*() const {
assert(nullableValue);
return *nullableValue;
}
T* operator->() {
assert(nullableValue);
return nullableValue;
}
const T* operator->() const {
assert(nullableValue);
return nullableValue;
}
T valueOr( T const& defaultValue ) const { T valueOr( T const& defaultValue ) const {
return nullableValue ? *nullableValue : defaultValue; return nullableValue ? *nullableValue : defaultValue;