diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/viewer/BisectSlide.cpp | 5 | ||||
-rw-r--r-- | tools/viewer/SlideDir.cpp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tools/viewer/BisectSlide.cpp b/tools/viewer/BisectSlide.cpp index 38ab3c3ffd..0239ef2b0d 100644 --- a/tools/viewer/BisectSlide.cpp +++ b/tools/viewer/BisectSlide.cpp @@ -11,6 +11,8 @@ #include "SkPicture.h" #include "SkStream.h" +#include <utility> + #ifdef SK_XML #include "SkDOM.h" #include "../experimental/svg/model/SkSVGDOM.h" @@ -74,7 +76,8 @@ bool BisectSlide::onChar(SkUnichar c) { switch (c) { case 'X': if (!fTossedPaths.empty()) { - SkTSwap(fFoundPaths, fTossedPaths); + using std::swap; + swap(fFoundPaths, fTossedPaths); if ('X' == fTrail.back()) { fTrail.pop_back(); } else { diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp index 41bff87b79..0cc1230b38 100644 --- a/tools/viewer/SlideDir.cpp +++ b/tools/viewer/SlideDir.cpp @@ -25,6 +25,7 @@ #include "SkTypeface.h" #include <cmath> +#include <utility> namespace { @@ -147,8 +148,9 @@ public: void startUnfocus() { SkASSERT(fTarget); - SkTSwap(fM0, fM1); - SkTSwap(fOpacity0, fOpacity1); + using std::swap; + swap(fM0, fM1); + swap(fOpacity0, fOpacity1); fTimeBase = 0; fState = State::kUnfocusing; |