--- utils/variant-impl.hpp.orig 2017-01-02 19:30:30 UTC +++ utils/variant-impl.hpp @@ -306,12 +306,12 @@ struct get_index(); static const bool is_relaxed_match = relaxed_same(); - static const bool is_variant = is_variant::value; + static const bool is_variant_match = is_variant::value; static const bool is_ud_match = Checker::value; - static const bool is_strict_ud_match = is_ud_match && !is_variant; + static const bool is_strict_ud_match = is_ud_match && !is_variant_match; typedef typename get_index_of_variant::type variant_indices; - static const int var_quality = is_variant ? variant_indices::quality - 2 : 0; + static const int var_quality = is_variant_match ? variant_indices::quality - 2 : 0; // Match quality: // exact > su > rel > strict_ud > ud @@ -335,7 +335,7 @@ struct get_index