[XPTI] Universal ID changes to support key in std::map

+ Universal ID needs to be available for use as a
key in std::map and this requires std::less
understanding this type or the type supporting
operator<(). Removing the std::less implementation
as the object already supports operator<(). Add unit
tests to see if the std::map insertions are ordered.

Signed-off-by: Vasanth Tovinkere <[email protected]>

Author: tovinkere

xpti/include/xpti_data_types.h

@@ -62,19 +62,6 @@ struct uid_t {
 
 /// Specialize std::hash to support xpti::uid_t
 namespace std {
-template <>
-struct less<xpti::uid_t>
-    : public binary_function<xpti::uid_t, xpti::uid_t, bool> {
-  std::size_t operator()(const xpti::uid_t &lhs, const xpti::uid_t &rhs) const {
-    if (lhs.p1 < rhs.p1)
-      return true;
-    if (lhs.p1 == rhs.p1 && lhs.p2 < rhs.p2)
-      return true;
-    if (lhs.p1 == rhs.p1 && lhs.p2 == rhs.p2 && lhs.p3 < rhs.p3)
-      return true;
-    return false;
-  }
-};
 template <> struct hash<xpti::uid_t> {
   std::size_t operator()(const xpti::uid_t &key) const { return key.hash(); }
 };

xptifw/unit_test/xpti_correctness_tests.cpp

@@ -374,6 +374,12 @@ TEST(xptiCorrectnessTest, xptiUniversalIDMapTest) {
   for (auto &e : MapTest) {
     EXPECT_EQ(e.first.hash(), e.second);
   }
+  // Check if the IDs are in sorted order
+  xpti::uid_t prev;
+  for (auto &e : MapTest) {
+    bool test = prev < e.first;
+    EXPECT_EQ(test, true);
+  }
 }
 
 TEST(xptiCorrectnessTest, xptiUniversalIDUnorderedMapTest) {