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

Unified Diff: extensions/common/permissions/usb_device_permission_data.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/usb_device_permission_data.cc
diff --git a/extensions/common/permissions/usb_device_permission_data.cc b/extensions/common/permissions/usb_device_permission_data.cc
index 532886d79ef43243234275f0ed3775e06f720002..fbd442809af7c981ce500cade41b9569d33feb03 100644
--- a/extensions/common/permissions/usb_device_permission_data.cc
+++ b/extensions/common/permissions/usb_device_permission_data.cc
@@ -5,6 +5,7 @@
#include "extensions/common/permissions/usb_device_permission_data.h"
#include <string>
+#include <tuple>
#include <vector>
#include "base/basictypes.h"
@@ -90,13 +91,8 @@ bool UsbDevicePermissionData::FromValue(const base::Value* value) {
bool UsbDevicePermissionData::operator<(
const UsbDevicePermissionData& rhs) const {
- if (vendor_id_ == rhs.vendor_id_) {
- if (product_id_ == rhs.product_id_)
- return interface_id_ < rhs.interface_id_;
-
- return product_id_ < rhs.product_id_;
- }
- return vendor_id_ < rhs.vendor_id_;
+ return std::tie(vendor_id_, product_id_, interface_id_) <
+ std::tie(rhs.vendor_id_, rhs.product_id_, rhs.interface_id_);
}
bool UsbDevicePermissionData::operator==(
« no previous file with comments | « extensions/common/permissions/socket_permission_entry.cc ('k') | extensions/renderer/user_script_injector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698