Merge from trunk GCC workaround (fixes #8651)

svn path=/branches/release/boost/variant/; revision=84747