From 45b49a8073a3634fcbca08ed29f4feefb1d794e6 Mon Sep 17 00:00:00 2001 From: "allanwoj@chromium.org" Date: Tue, 24 Aug 2010 09:23:58 +0000 Subject: 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 --- chrome/browser/geolocation/device_data_provider.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chrome/browser') 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 -#include #include #include @@ -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 { +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 { +struct RouterDataLess { bool operator()(const RouterData& data1, const RouterData& data2) const { return data1.mac_address < data2.mac_address; -- cgit v1.1