Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-10-05 19:22:22 +0200
committerMartin Hořeňovský2021-10-05 19:22:22 +0200
commitc6c46a168f5213d2daa4eccd6d725ced11229c49 (patch)
tree331b4cb392b2857b3f1b242b6775d2b826354881 /src
parent48a889859bca45ee2c5e5064199c1e5b4b3e00cb (diff)
downloadcatch3-c6c46a168f5213d2daa4eccd6d725ced11229c49.tar.gz
Add non-empty assertion to Option's deref op
Diffstat (limited to 'src')
-rw-r--r--src/catch2/internal/catch_option.hpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/catch2/internal/catch_option.hpp b/src/catch2/internal/catch_option.hpp
index 04e4d69e..da335653 100644
--- a/src/catch2/internal/catch_option.hpp
+++ b/src/catch2/internal/catch_option.hpp
@@ -46,10 +46,22 @@ namespace Catch {
nullableValue = nullptr;
}
- T& operator*() { return *nullableValue; }
- T const& operator*() const { return *nullableValue; }
- T* operator->() { return nullableValue; }
- const T* operator->() const { return nullableValue; }
+ T& operator*() {
+ assert(nullableValue);
+ 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 {
return nullableValue ? *nullableValue : defaultValue;