Use std::swap and add a default case for the switch statement

Use std::swap and add a default case for the switch statement #1064