Fixed windows build. Swap pointers now works

Change-Id: I0b086d070e56bef6237d66ce345f9f4da8a6e079
Reviewed-on: http://www.matthewh.me/gerrit/51
Reviewed-by: Matthew Hoggan <mehoggan@gmail.com>
Tested-by: Matthew Hoggan <mehoggan@gmail.com>