Make BOOST_WORKAROUND consistent.

svn path=; revision=84443