From 3b0cf4761abb6523359a4e62ea05e621b70b48c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= <sebastien.deronne@gmail.com>
Date: Tue, 25 Jul 2023 21:21:03 +0200
Subject: [PATCH] wifi: Fix operator< for HeRu

---
 src/wifi/model/he/he-ru.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wifi/model/he/he-ru.cc b/src/wifi/model/he/he-ru.cc
index 7e873d65b..662245e28 100644
--- a/src/wifi/model/he/he-ru.cc
+++ b/src/wifi/model/he/he-ru.cc
@@ -23,6 +23,7 @@
 #include "ns3/assert.h"
 
 #include <optional>
+#include <tuple>
 
 namespace ns3
 {
@@ -896,8 +897,8 @@ HeRu::RuSpec::operator<(const RuSpec& other) const
     // we do not compare the RU PHY indices because they may be uninitialized for
     // one of the compared RUs. This event should not cause the comparison to evaluate
     // to false
-    return m_ruType < other.m_ruType || m_index < other.m_index ||
-           m_primary80MHz < other.m_primary80MHz;
+    return std::tie(m_ruType, m_index, m_primary80MHz) <
+           std::tie(other.m_ruType, other.m_index, other.m_primary80MHz);
 }
 
 } // namespace ns3