--- a/src/core/ptr.h	Thu Jul 19 13:45:07 2007 +0200
+++ b/src/core/ptr.h	Thu Jul 19 13:53:14 2007 +0200
@@ -184,10 +184,10 @@
 };
 
 template <typename T>
-struct EventMemberImplTraits;
+struct EventMemberImplObjTraits;
 
 template <typename T>
-struct EventMemberImplTraits<Ptr<T> >
+struct EventMemberImplObjTraits<Ptr<T> >
 {
   static T &GetReference (Ptr<T> p) {
     return *PeekPointer (p);

--- a/src/simulator/simulator.h	Thu Jul 19 13:45:07 2007 +0200
+++ b/src/simulator/simulator.h	Thu Jul 19 13:53:14 2007 +0200
@@ -584,10 +584,10 @@
 namespace ns3 {
 
 template <typename T>
-struct EventMemberImplTraits;
+struct EventMemberImplObjTraits;
 
 template <typename T>
-struct EventMemberImplTraits<T *>
+struct EventMemberImplObjTraits<T *>
 {
   static T &GetReference (T *p) {
     return *p;
@@ -608,7 +608,7 @@
     virtual ~EventMemberImpl0 () {}
   private:
     virtual void Notify (void) { 
-      (EventMemberImplTraits<OBJ>::GetReference (m_obj).*m_function) (); 
+      (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (); 
     }
     OBJ m_obj;
     F m_function;
@@ -633,7 +633,7 @@
     virtual ~EventMemberImpl1 () {}
   private:
     virtual void Notify (void) { 
-      (EventMemberImplTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1);
+      (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1);
     }
     OBJ m_obj;
     F m_function;
@@ -660,7 +660,7 @@
     virtual ~EventMemberImpl2 () {}
   private:
     virtual void Notify (void) { 
-      (EventMemberImplTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2);
+      (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2);
     }
     OBJ m_obj;
     F m_function;
@@ -689,7 +689,7 @@
     virtual ~EventMemberImpl3 () {}
   private:
     virtual void Notify (void) { 
-      (EventMemberImplTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3);
+      (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3);
     }
     OBJ m_obj;
     F m_function;
@@ -720,7 +720,7 @@
     virtual ~EventMemberImpl4 () {}
   private:
     virtual void Notify (void) { 
-      (EventMemberImplTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3, m_a4);
+      (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3, m_a4);
     }
     OBJ m_obj;
     F m_function;
@@ -754,7 +754,7 @@
     virtual ~EventMemberImpl5 () {}
   private:
     virtual void Notify (void) { 
-      (EventMemberImplTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3, m_a4, m_a5);
+      (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3, m_a4, m_a5);
     }
     OBJ m_obj;
     F m_function;