Use C++11 std::swap()

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

Use C++11 std::swap()
b8c63935 · Nicolas Capens · Nicolas Capens · 289a576d · b8c63935 · b8c63935
Commit b8c63935 authored Mar 19, 2019 by Nicolas Capens Committed by Nicolas Capens Mar 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 12 deletions

Blitter.cpp src/Device/Blitter.cpp +6 -4

Math.hpp src/System/Math.hpp +0 -8

No files found.
--- 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);

--- 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)
 	{