From 1fcf7c4c4b9b59578cee8db89a2ef65ec65cd8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <andre.apitzsch@etit.tu-chemnitz.de>
Date: Fri, 8 Mar 2024 11:17:12 +0100
Subject: [PATCH] core: Move EventMemberImplObjTraits to namespace internal

---
 src/core/model/make-event.h | 8 +++++++-
 src/core/model/ptr.h        | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/core/model/make-event.h b/src/core/model/make-event.h
index ca1fbfc32..a18853cee 100644
--- a/src/core/model/make-event.h
+++ b/src/core/model/make-event.h
@@ -94,6 +94,9 @@ EventImpl* MakeEvent(T function);
 namespace ns3
 {
 
+namespace internal
+{
+
 /**
  * \ingroup events
  * Helper for the MakeEvent functions which take a class method.
@@ -130,6 +133,8 @@ struct EventMemberImplObjTraits<T*>
     }
 };
 
+} // namespace internal
+
 template <typename MEM, typename OBJ, typename... Ts>
 std::enable_if_t<std::is_member_pointer_v<MEM>, EventImpl*>
 MakeEvent(MEM mem_ptr, OBJ obj, Ts... args)
@@ -154,7 +159,8 @@ MakeEvent(MEM mem_ptr, OBJ obj, Ts... args)
         {
             std::apply(
                 [this](Ts... args) {
-                    (EventMemberImplObjTraits<OBJ>::GetReference(m_obj).*m_function)(args...);
+                    (internal::EventMemberImplObjTraits<OBJ>::GetReference(m_obj).*
+                     m_function)(args...);
                 },
                 m_arguments);
         }
diff --git a/src/core/model/ptr.h b/src/core/model/ptr.h
index 06a988b01..7f0cf3039 100644
--- a/src/core/model/ptr.h
+++ b/src/core/model/ptr.h
@@ -401,6 +401,9 @@ struct CallbackTraits<Ptr<T>>
     }
 };
 
+namespace internal
+{
+
 // Duplicate of struct EventMemberImplObjTraits<T> as defined in make-event.h
 // We repeat it here to declare a specialization on Ptr<T>
 // without making this header dependent on make-event.h
@@ -428,6 +431,8 @@ struct EventMemberImplObjTraits<Ptr<T>>
     }
 };
 
+} // namespace internal
+
 } // namespace ns3
 
 namespace ns3