Using std::swap instead of CC_SWAP

CC_SWAP is deprecated. Use `std::swap` instead.
Merge pull request #9134 from ricardoquesada/std_swap

Using std::swap instead of CC_SWAP