Rename our old swap macro because it breaks STL

also our inline macro also breaks STL

use stack c++ strings in Pin to fix pointer warnings