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/sexpr/variant.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/sexpr/variant.hpp')
| -rw-r--r-- | src/sexpr/variant.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sexpr/variant.hpp b/src/sexpr/variant.hpp index ecf0237..287a5f0 100644 --- a/src/sexpr/variant.hpp +++ b/src/sexpr/variant.hpp @@ -35,13 +35,13 @@ namespace tmwa { namespace sexpr { -#define MATCH(expr) \ - WITH_VAR(auto&&, _match_var, expr) \ +#define MATCH(expr) \ + WITH_VAR_NOLOOP(auto&&, _match_var, expr) \ switch (tmwa::sexpr::VariantFriend::get_state(_match_var)) #define TYPED_CASE(ty, var, look) \ break; \ case tmwa::sexpr::VariantFriend::get_state_for<look, decltype(_match_var)>(): \ - WITH_VAR(ty, var, tmwa::sexpr::VariantFriend::unchecked_get<look>(_match_var)) + WITH_VAR_INLOOP(ty, var, tmwa::sexpr::VariantFriend::unchecked_get<look>(_match_var)) #define CASE(ty, var) TYPED_CASE(ty, var, std::remove_const<std::remove_reference<ty>::type>::type) template<class... T> |