diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
commit | 4c91abd6a020ee030114ae3f22d8f6066e7528be (patch) | |
tree | 9f76256eabe4900a7eef6cbb94b7ed2378b93f48 /src/compat/option.hpp | |
parent | 0a202555d2e12866b3619af92f50cb38ea4adb12 (diff) | |
parent | 711680d652a8db17c1b91428b6d6835f30dfb4fd (diff) | |
download | tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.gz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.bz2 tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.xz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.zip |
Merge remote-tracking branch 'origin/hotfix'
Conflicts:
src/map/chrif.cpp
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; |