Use C++11 std::swap()

Bug b/126126820

Change-Id: Iaf3991d58c64995018ba0d15773b65d463e03fad
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27549
Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

diff --git a/src/Device/Blitter.cpp b/src/Device/Blitter.cpp
index 06f9a66..06aa87d 100644 (file)
--- a/src/Device/Blitter.cpp
+++ b/src/Device/Blitter.cpp
@@ -20,6 +20,8 @@
 #include "Vulkan/VkDebug.hpp"
 #include "Vulkan/VkImage.hpp"
 
+#include <utility>
+
 namespace sw
 {
        Blitter::Blitter()
@@ -1523,14 +1525,14 @@ namespace sw
 
                if(region.dstOffsets[0].x > region.dstOffsets[1].x)
                {
-                       swap(region.srcOffsets[0].x, region.srcOffsets[1].x);
-                       swap(region.dstOffsets[0].x, region.dstOffsets[1].x);
+                       std::swap(region.srcOffsets[0].x, region.srcOffsets[1].x);
+                       std::swap(region.dstOffsets[0].x, region.dstOffsets[1].x);
                }
 
                if(region.dstOffsets[0].y > region.dstOffsets[1].y)
                {
-                       swap(region.srcOffsets[0].y, region.srcOffsets[1].y);
-                       swap(region.dstOffsets[0].y, region.dstOffsets[1].y);
+                       std::swap(region.srcOffsets[0].y, region.srcOffsets[1].y);
+                       std::swap(region.dstOffsets[0].y, region.dstOffsets[1].y);
                }
 
                VkExtent3D srcExtent = src->getMipLevelExtent(region.srcSubresource.mipLevel);

diff --git a/src/System/Math.hpp b/src/System/Math.hpp
index 79c8e74..9ba58b0 100644 (file)
--- a/src/System/Math.hpp
+++ b/src/System/Math.hpp
@@ -66,14 +66,6 @@ namespace sw
                return min(min(a, b), min(c, d));
        }
 
-       template<class T>
-       inline void swap(T &a, T &b)
-       {
-               T t = a;
-               a = b;
-               b = t;
-       }
-
        template <typename destType, typename sourceType>
        destType bit_cast(const sourceType &source)
        {