add detail function for object rank that can be used for comparison

add detecting if `uintptr_t` is defined
AIDASoft · Nov 29, 2024 · 25abd06 · 25abd06
1 parent 9942d56
commit 25abd06
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/include/podio/detail/RankType.h b/include/podio/detail/RankType.h
@@ -0,0 +1,13 @@
+#ifndef PODIO_DETAIL_RANKTYPE_H
+#define PODIO_DETAIL_RANKTYPE_H
+#include <cstdint>
+
+namespace podio::detail {
+#ifdef UINTPTR_MAX
+using rank_type = uintptr_t;
+#else
+using rank_type = uintmax_t;
+#endif
+} // namespace podio::detail
+
+#endif // PODIO_DETAIL_RANKTYPE_H
diff --git a/python/templates/Interface.h.jinja2 b/python/templates/Interface.h.jinja2
@@ -12,6 +12,7 @@
 
 #include "podio/ObjectID.h"
 #include "podio/utilities/TypeHelpers.h"
+#include "podio/detail/RankType.h"
 
 #include <memory>
 #include <ostream>
@@ -59,7 +60,7 @@ private:
 {{ macros.member_getters_concept(Members, use_get_syntax) }}
     virtual const std::type_info& typeInfo() const = 0;
     virtual bool equal(const Concept* rhs) const = 0;
-    virtual const void* objAddress() const = 0;
+    virtual podio::detail::rank_type objRank() const = 0;
   };
 
   template<typename ValueT>
@@ -88,8 +89,8 @@ private:
       return false;
     }
 
-    const void* objAddress() const final {
-      return m_value.m_obj.get();
+    podio::detail::rank_type objRank() const final {
+      return podio::detail::getRank(m_value);
     }
 
 {{ macros.member_getters_model(Members, use_get_syntax) }}
@@ -169,7 +170,7 @@ public:
   }
 
   friend bool operator<(const {{ class.bare_type }}& lhs, const {{ class.bare_type }}& rhs) {
-    return lhs.m_self->objAddress() < rhs.m_self->objAddress();
+    return lhs.m_self->objRank() < rhs.m_self->objRank();
   }
 
 {{ macros.member_getters(Members, use_get_syntax) }}

diff --git a/python/templates/Object.cc.jinja2 b/python/templates/Object.cc.jinja2
@@ -43,3 +43,7 @@
                       VectorMembers, use_get_syntax)}}
 
 {{ utils.namespace_close(class.namespace) }}
+
+podio::detail::rank_type podio::detail::getRank(const {{ class.namespace }}::{{ class.bare_type }}& obj) {
+  return reinterpret_cast<rank_type>(obj.m_obj.get());
+}
diff --git a/python/templates/Object.h.jinja2 b/python/templates/Object.h.jinja2
@@ -12,6 +12,7 @@
 {% endfor %}
 
 #include "podio/utilities/MaybeSharedPtr.h"
+#include "podio/detail/RankType.h"
 
 #include <ostream>
 #include <cstdint>
@@ -22,6 +23,10 @@
 
 {{ utils.forward_decls(forward_declarations) }}
 
+namespace podio::detail {
+rank_type getRank(const {{ class.namespace }}::{{ class.bare_type }}& obj);
+};
+
 {{ utils.namespace_open(class.namespace) }}
 class Mutable{{ class.bare_type }};
 class {{ class.bare_type }}Collection;
@@ -34,9 +39,7 @@ class {{ class.bare_type }} {
   friend class {{ class.bare_type }}Collection;
   friend class {{ class.full_type }}CollectionData;
   friend class {{ class.bare_type }}CollectionIterator;
-{% for interface in using_interface_types %}
-  friend class {{ interface }};
-{% endfor %}
+  friend podio::detail::rank_type podio::detail::getRank(const {{ class.bare_type }} & obj);
 
 public:
   using mutable_type = Mutable{{ class.bare_type }};

diff --git a/python/templates/macros/declarations.jinja2 b/python/templates/macros/declarations.jinja2
@@ -97,7 +97,7 @@
   bool operator!=(const {{ inverse_type }}& other) const { return !(*this == other); }
 
   // less comparison operator, so that objects can be e.g. stored in sets.
-  bool operator<(const {{ full_type }}& other) const { return m_obj < other.m_obj; }
+  bool operator<(const {{ full_type }}& other) const { return podio::detail::getRank(*this) < podio::detail::getRank(other); }
 
   podio::ObjectID id() const { return getObjectID(); }