Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1002)

Unified Diff: extensions/common/permissions/socket_permission_entry.cc

Issue 1461163002: Use std::tie() for operator< in extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/permissions/socket_permission_entry.cc
diff --git a/extensions/common/permissions/socket_permission_entry.cc b/extensions/common/permissions/socket_permission_entry.cc
index 31ec6b859896439fe352a37910c795557438b0d9..926a07b96bc7dca83cc61966d65552674c1c16e9 100644
--- a/extensions/common/permissions/socket_permission_entry.cc
+++ b/extensions/common/permissions/socket_permission_entry.cc
@@ -6,6 +6,7 @@
#include <cstdlib>
#include <sstream>
+#include <tuple>
#include <vector>
#include "base/logging.h"
@@ -43,24 +44,10 @@ SocketPermissionEntry::SocketPermissionEntry()
SocketPermissionEntry::~SocketPermissionEntry() {}
bool SocketPermissionEntry::operator<(const SocketPermissionEntry& rhs) const {
- if (pattern_.type < rhs.pattern_.type)
- return true;
- if (pattern_.type > rhs.pattern_.type)
- return false;
-
- if (pattern_.host < rhs.pattern_.host)
- return true;
- if (pattern_.host > rhs.pattern_.host)
- return false;
-
- if (match_subdomains_ < rhs.match_subdomains_)
- return true;
- if (match_subdomains_ > rhs.match_subdomains_)
- return false;
-
- if (pattern_.port < rhs.pattern_.port)
- return true;
- return false;
+ return std::tie(pattern_.type, pattern_.host, match_subdomains_,
+ pattern_.port) <
+ std::tie(rhs.pattern_.type, rhs.pattern_.host, rhs.match_subdomains_,
+ rhs.pattern_.port);
}
bool SocketPermissionEntry::operator==(const SocketPermissionEntry& rhs) const {

Powered by Google App Engine
This is Rietveld 408576698