From 711680d652a8db17c1b91428b6d6835f30dfb4fd Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 19 Nov 2014 17:44:13 -0800 Subject: Magically allow "break" within WITH_VAR --- src/compat/option.hpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/compat/option.hpp') diff --git a/src/compat/option.hpp b/src/compat/option.hpp index 1976589..7beef6f 100644 --- a/src/compat/option.hpp +++ b/src/compat/option.hpp @@ -424,9 +424,12 @@ namespace option tmwa::option::option_unwrap(std::move(o)); \ }).maybe_ref_fun() // immediately preceded by 'if'; not double-eval-safe -#define OPTION_IS_SOME(var, expr) \ - ((expr).is_some()) \ - WITH_VAR(auto&, var, *(expr).ptr_or(nullptr)) +#define OPTION_IS_SOME_INLOOP(var, expr) \ + ((expr).is_some()) \ + WITH_VAR_INLOOP(auto&, var, *(expr).ptr_or(nullptr)) +#define OPTION_IS_SOME_NOLOOP(var, expr) \ + ((expr).is_some()) \ + WITH_VAR_NOLOOP(auto&, var, *(expr).ptr_or(nullptr)) } // namespace option //using option::Option; -- cgit v1.2.3-70-g09d2