diff options
| author | allanwoj@chromium.org <allanwoj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 09:23:58 +0000 |
|---|---|---|
| committer | allanwoj@chromium.org <allanwoj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-24 09:23:58 +0000 |
| commit | 45b49a8073a3634fcbca08ed29f4feefb1d794e6 (patch) | |
| tree | 5fd6572a1e642e30160f07eae96b12e0b80702d6 | |
| parent | f3864e6b60923a9ab5eb8813b940d10acbb03cf0 (diff) | |
| download | chromium_src-45b49a8073a3634fcbca08ed29f4feefb1d794e6.zip chromium_src-45b49a8073a3634fcbca08ed29f4feefb1d794e6.tar.gz chromium_src-45b49a8073a3634fcbca08ed29f4feefb1d794e6.tar.bz2 | |
Removed inheritance of std:less in network data structures
BUG=None
TEST-None
Review URL: http://codereview.chromium.org/3116032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57159 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/geolocation/device_data_provider.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/geolocation/device_data_provider.h b/chrome/browser/geolocation/device_data_provider.h index 00d5d3b..6e659a2 100644 --- a/chrome/browser/geolocation/device_data_provider.h +++ b/chrome/browser/geolocation/device_data_provider.h @@ -24,7 +24,6 @@ #pragma once #include <algorithm> -#include <functional> #include <set> #include <vector> @@ -133,7 +132,7 @@ struct AccessPointData { // This is to allow AccessPointData to be used in std::set. We order // lexicographically by MAC address. -struct AccessPointDataLess : public std::less<AccessPointData> { +struct AccessPointDataLess { bool operator()(const AccessPointData& data1, const AccessPointData& data2) const { return data1.mac_address < data2.mac_address; @@ -185,7 +184,7 @@ struct RouterData { // This is to allow RouterData to be used in std::set. We order // lexicographically by MAC address. -struct RouterDataLess : public std::less<RouterData> { +struct RouterDataLess { bool operator()(const RouterData& data1, const RouterData& data2) const { return data1.mac_address < data2.mac_address; |