stephb9959
2022-08-29 10:38:39 -07:00
parent 5db6fc3027
commit 8dcfe04310
2 changed files with 5 additions and 11 deletions

View File

@@ -120,15 +120,10 @@ namespace OpenWifi {
// sort by timestamp & serial number.
struct {
/* bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
if(lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
if(lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
return lhs.timestamp < rhs.timestamp;
*/
bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
if(lhs.timestamp < rhs.timestamp) return true;
if(lhs.timestamp > rhs.timestamp) return false;
return lhs.device_info.serialNumber < rhs.device_info.serialNumber;
if (lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
if (lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
return lhs.timestamp < rhs.timestamp;
}
} DeviceTimePoint_sort;
@@ -142,8 +137,7 @@ namespace OpenWifi {
struct {
bool operator()(const AnalyticsObjects::UETimePoint &lhs, const AnalyticsObjects::UETimePoint &rhs) const {
if(lhs.station < rhs.station) return true;
return false;
return (lhs.station < rhs.station);
}
} Association_sort;