Code is now backward-compatible with g++-4.4