Ah, that's silly. Commenting out every instance of
#define swap V_swap
seems to work. This effectively reverts one of my previous commits in my fork
which intended to avoid conflicts with libstdc++ at the time. (It predates the corresponding commit to fix this
Not sure why the redefinition doesn't show up in the compiler errors, but regardless, this is solved.