diff options
| author | jsbell <jsbell@chromium.org> | 2015-11-20 11:37:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-20 19:38:57 +0000 |
| commit | 9a9ef2b842828e764ad7e120b6563025d27bdaad (patch) | |
| tree | f9140076ad1fd6a8d6090158ba239a3c32dde03c /extensions/common/api | |
| parent | f38d62d883828354c5f4711307c6391a00a3e8a8 (diff) | |
| download | chromium_src-9a9ef2b842828e764ad7e120b6563025d27bdaad.zip chromium_src-9a9ef2b842828e764ad7e120b6563025d27bdaad.tar.gz chromium_src-9a9ef2b842828e764ad7e120b6563025d27bdaad.tar.bz2 | |
Use std::tie() for operator< in extensions/
Simplify the code for operator< when comparing multiple members using
a common std::tie idiom.
BUG=555171
R=rdevlin.cronin@chromium.org
Review URL: https://codereview.chromium.org/1461163002
Cr-Commit-Position: refs/heads/master@{#360879}
Diffstat (limited to 'extensions/common/api')
| -rw-r--r-- | extensions/common/api/sockets/sockets_manifest_permission_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc index ad5ba16..bccce57 100644 --- a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc +++ b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include <set> +#include <tuple> #include "base/json/json_reader.h" #include "base/pickle.h" @@ -67,10 +68,8 @@ struct CheckFormatEntry { // operators <, == are needed by container std::set and algorithms // std::set_includes and std::set_differences. bool operator<(const CheckFormatEntry& rhs) const { - if (operation_type == rhs.operation_type) - return host_pattern < rhs.host_pattern; - - return operation_type < rhs.operation_type; + return std::tie(operation_type, host_pattern) < + std::tie(rhs.operation_type, rhs.host_pattern); } bool operator==(const CheckFormatEntry& rhs) const { |