hate that stupid auto_ptr deprecation warning

Change-Id: I8b290b61d7f081d5b2b72805968a374c91721cc3