diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-11-19 17:44:13 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-11-19 18:19:45 -0800 |
| commit | 711680d652a8db17c1b91428b6d6835f30dfb4fd (patch) | |
| tree | 0d64c8314f8531e2a09c7dc5e242333ddec6582b /src/compat/option.hpp | |
| parent | 078028058d2e9fbcde2147eb4154830e08652066 (diff) | |
| download | tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.gz tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.bz2 tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.xz tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.zip | |
Magically allow "break" within WITH_VAR
Diffstat (limited to 'src/compat/option.hpp')
| -rw-r--r-- | src/compat/option.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
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; |