Merge pull request #3430 from lioncash/compare

ProgramShaderCache: Simplify SHADERUID comparison operators

1 files changed, 6 insertions, 17 deletions

diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
index d20da70d2f..1a759b6b9d 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <tuple>
+
 #include "Common/LinearDiskCache.h"
 #include "Common/GL/GLUtil.h"
 
@@ -29,27 +31,14 @@ public:
 
 	bool operator <(const SHADERUID& r) const
 	{
-		if (puid < r.puid)
-			return true;
-
-		if (r.puid < puid)
-			return false;
-
-		if (vuid < r.vuid)
-			return true;
-
-		if (r.vuid < vuid)
-			return false;
-
-		if (guid < r.guid)
-			return true;
-
-		return false;
+		return std::tie(puid, vuid, guid) <
+		       std::tie(r.puid, r.vuid, r.guid);
 	}
 
 	bool operator ==(const SHADERUID& r) const
 	{
-		return puid == r.puid && vuid == r.vuid && guid == r.guid;
+		return std::tie(puid, vuid, guid) ==
+		       std::tie(r.puid, r.vuid, r.guid);
 	}
 };