Make sure to be able to compile in complete void-safe for 14.05 and still compile with 13.11

Make sure to be able to compile in complete void-safe for 14.05 and still compile with 13.11