From a7f64f0b39cb7141f16608c171b20bee452fd024 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 23 Jul 2014 23:55:41 -0700
Subject: In magic, use Variant for all the old anonymous nested unions

---
 src/sexpr/variant.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/sexpr/variant.hpp')

diff --git a/src/sexpr/variant.hpp b/src/sexpr/variant.hpp
index 50ee77f..fbf9345 100644
--- a/src/sexpr/variant.hpp
+++ b/src/sexpr/variant.hpp
@@ -41,10 +41,11 @@ namespace sexpr
 #define MATCH(expr)                     \
     WITH_VAR(auto&&, _match_var, expr)  \
     switch (tmwa::sexpr::VariantFriend::get_state(_match_var))
-#define CASE(ty, var)                                                           \
-    break;                                                                      \
-    case tmwa::sexpr::VariantFriend::get_state_for<ty, decltype(_match_var)>(): \
-    WITH_VAR(ty, var, tmwa::sexpr::VariantFriend::unchecked_get<ty>(_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))
+#define CASE(ty, var) TYPED_CASE(ty, var, std::remove_const<std::remove_reference<ty>::type>::type)
 
     template<class... T>
     class Variant
-- 
cgit v1.2.3-70-g09d2