On Mon, 8 Apr 2019 at 19:02, Jonathan Wakely <jwak...@redhat.com> wrote: > The attached patch implements the same thing with totally separate > __gen_vtable_r and __gen_vtable_r_impl class templates, instead of > adding all the visit<R> functionality into the existing code (and then > needing to tease it apart again with if-constexpr). > > The visit<R> implementation doesn't need to care about the > __variant_cookie or __variant_idx_cookie cases, which simplifies > things. > > This also adjusts some whitespace, for correct indentation and for > readability. And removes a redundant && from a type. > > What do you think?
I hate the duplication of __gen_vtable with a burning passion, because *that* is the part that causes me heartburn, not the compile-time ifs in the other bits. But if this is what you want to ship, I can live with it.