We currently #define a bunch of names in cp-tree.h, never override them, and then use them exactly once during initialization. I think these were hold-overs from when changing from the old to new ABI. Anyway, I see no reason for the indirection. I also renamed the cdtor variant names to be consistent with the generic name. IIRC '__ct' and '__dt' were from the old-abi cdtor names. These never escape the compiler. I think that's it for today's patching run. nathan -- Nathan Sidwell