--- a/src/simulator/make-event.h Thu Apr 08 13:28:54 2010 +0200
+++ b/src/simulator/make-event.h Thu Apr 08 13:39:07 2010 +0200
@@ -6,49 +6,49 @@
class EventImpl;
template <typename MEM, typename OBJ>
-EventImpl *MakeEvent (MEM mem_ptr, OBJ obj);
+EventImpl * MakeEvent (MEM mem_ptr, OBJ obj);
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1>
-EventImpl *MakeEvent (MEM mem_ptr, OBJ obj, T1 a1);
+EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1);
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1, typename T2>
EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2);
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1, typename T2, typename T3>
EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2, T3 a3);
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1, typename T2, typename T3, typename T4>
EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2, T3 a3, T4 a4);
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1, typename T2, typename T3, typename T4, typename T5>
-EventImpl * MakeEvent (MEM mem_ptr, OBJ obj,
- T1 a1, T2 a2, T3 a3, T4 a4, T5 a5);
+EventImpl * MakeEvent (MEM mem_ptr, OBJ obj,
+ T1 a1, T2 a2, T3 a3, T4 a4, T5 a5);
-EventImpl * MakeEvent (void (*f) (void));
-template <typename U1,
+EventImpl * MakeEvent (void (*f)(void));
+template <typename U1,
typename T1>
-EventImpl * MakeEvent (void (*f) (U1), T1 a1);
+EventImpl * MakeEvent (void (*f)(U1), T1 a1);
-template <typename U1, typename U2,
+template <typename U1, typename U2,
typename T1, typename T2>
-EventImpl * MakeEvent (void (*f) (U1,U2), T1 a1, T2 a2);
+EventImpl * MakeEvent (void (*f)(U1,U2), T1 a1, T2 a2);
template <typename U1, typename U2, typename U3,
typename T1, typename T2, typename T3>
-EventImpl * MakeEvent (void (*f) (U1,U2,U3), T1 a1, T2 a2, T3 a3);
+EventImpl * MakeEvent (void (*f)(U1,U2,U3), T1 a1, T2 a2, T3 a3);
template <typename U1, typename U2, typename U3, typename U4,
typename T1, typename T2, typename T3, typename T4>
-EventImpl * MakeEvent (void (*f) (U1,U2,U3,U4), T1 a1, T2 a2, T3 a3, T4 a4);
+EventImpl * MakeEvent (void (*f)(U1,U2,U3,U4), T1 a1, T2 a2, T3 a3, T4 a4);
template <typename U1, typename U2, typename U3, typename U4, typename U5,
typename T1, typename T2, typename T3, typename T4, typename T5>
-EventImpl * MakeEvent (void (*f) (U1,U2,U3,U4,U5), T1 a1, T2 a2, T3 a3, T4 a4, T5 a5);
+EventImpl * MakeEvent (void (*f)(U1,U2,U3,U4,U5), T1 a1, T2 a2, T3 a3, T4 a4, T5 a5);
} // namespace ns3
@@ -67,50 +67,61 @@
template <typename T>
struct EventMemberImplObjTraits<T *>
{
- static T &GetReference (T *p) {
+ static T &GetReference (T *p)
+ {
return *p;
}
};
template <typename MEM, typename OBJ>
-EventImpl * MakeEvent (MEM mem_ptr, OBJ obj)
+EventImpl * MakeEvent (MEM mem_ptr, OBJ obj)
{
// zero argument version
- class EventMemberImpl0 : public EventImpl {
- public:
- EventMemberImpl0 (OBJ obj, MEM function)
- : m_obj (obj),
+ class EventMemberImpl0 : public EventImpl
+ {
+public:
+ EventMemberImpl0 (OBJ obj, MEM function)
+ : m_obj (obj),
m_function (function)
- {}
- virtual ~EventMemberImpl0 () {}
- private:
- virtual void Notify (void) {
- (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) ();
+ {
+ }
+ virtual ~EventMemberImpl0 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function)();
}
OBJ m_obj;
MEM m_function;
- } * ev = new EventMemberImpl0 (obj, mem_ptr);
+ } *ev = new EventMemberImpl0 (obj, mem_ptr);
return ev;
}
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1>
EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1)
{
// one argument version
- class EventMemberImpl1 : public EventImpl {
- public:
- EventMemberImpl1 (OBJ obj, MEM function, T1 a1)
- : m_obj (obj),
+ class EventMemberImpl1 : public EventImpl
+ {
+public:
+ EventMemberImpl1 (OBJ obj, MEM function, T1 a1)
+ : m_obj (obj),
m_function (function),
m_a1 (a1)
- {}
- protected:
- virtual ~EventMemberImpl1 () {}
- private:
- virtual void Notify (void) {
- (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1);
+ {
+ }
+protected:
+ virtual ~EventMemberImpl1 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function)(m_a1);
}
OBJ m_obj;
MEM m_function;
@@ -119,24 +130,29 @@
return ev;
}
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1, typename T2>
-EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2)
+EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2)
{
// two argument version
- class EventMemberImpl2 : public EventImpl {
- public:
- EventMemberImpl2 (OBJ obj, MEM function, T1 a1, T2 a2)
- : m_obj (obj),
+ class EventMemberImpl2 : public EventImpl
+ {
+public:
+ EventMemberImpl2 (OBJ obj, MEM function, T1 a1, T2 a2)
+ : m_obj (obj),
m_function (function),
m_a1 (a1),
m_a2 (a2)
- { }
- protected:
- virtual ~EventMemberImpl2 () {}
- private:
- virtual void Notify (void) {
- (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2);
+ {
+ }
+protected:
+ virtual ~EventMemberImpl2 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function)(m_a1, m_a2);
}
OBJ m_obj;
MEM m_function;
@@ -146,25 +162,30 @@
return ev;
}
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1, typename T2, typename T3>
-EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2, T3 a3)
+EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2, T3 a3)
{
// three argument version
- class EventMemberImpl3 : public EventImpl {
- public:
- EventMemberImpl3 (OBJ obj, MEM function, T1 a1, T2 a2, T3 a3)
- : m_obj (obj),
+ class EventMemberImpl3 : public EventImpl
+ {
+public:
+ EventMemberImpl3 (OBJ obj, MEM function, T1 a1, T2 a2, T3 a3)
+ : m_obj (obj),
m_function (function),
m_a1 (a1),
m_a2 (a2),
m_a3 (a3)
- { }
- protected:
- virtual ~EventMemberImpl3 () {}
- private:
- virtual void Notify (void) {
- (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3);
+ {
+ }
+protected:
+ virtual ~EventMemberImpl3 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function)(m_a1, m_a2, m_a3);
}
OBJ m_obj;
MEM m_function;
@@ -175,26 +196,31 @@
return ev;
}
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1, typename T2, typename T3, typename T4>
-EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2, T3 a3, T4 a4)
+EventImpl * MakeEvent (MEM mem_ptr, OBJ obj, T1 a1, T2 a2, T3 a3, T4 a4)
{
// four argument version
- class EventMemberImpl4 : public EventImpl {
- public:
- EventMemberImpl4 (OBJ obj, MEM function, T1 a1, T2 a2, T3 a3, T4 a4)
- : m_obj (obj),
+ class EventMemberImpl4 : public EventImpl
+ {
+public:
+ EventMemberImpl4 (OBJ obj, MEM function, T1 a1, T2 a2, T3 a3, T4 a4)
+ : m_obj (obj),
m_function (function),
m_a1 (a1),
m_a2 (a2),
m_a3 (a3),
m_a4 (a4)
- { }
- protected:
- virtual ~EventMemberImpl4 () {}
- private:
- virtual void Notify (void) {
- (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3, m_a4);
+ {
+ }
+protected:
+ virtual ~EventMemberImpl4 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function)(m_a1, m_a2, m_a3, m_a4);
}
OBJ m_obj;
MEM m_function;
@@ -206,28 +232,33 @@
return ev;
}
-template <typename MEM, typename OBJ,
+template <typename MEM, typename OBJ,
typename T1, typename T2, typename T3, typename T4, typename T5>
-EventImpl * MakeEvent (MEM mem_ptr, OBJ obj,
- T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
+EventImpl * MakeEvent (MEM mem_ptr, OBJ obj,
+ T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
{
// five argument version
- class EventMemberImpl5 : public EventImpl {
- public:
- EventMemberImpl5 (OBJ obj, MEM function, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
- : m_obj (obj),
+ class EventMemberImpl5 : public EventImpl
+ {
+public:
+ EventMemberImpl5 (OBJ obj, MEM function, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
+ : m_obj (obj),
m_function (function),
m_a1 (a1),
m_a2 (a2),
m_a3 (a3),
m_a4 (a4),
m_a5 (a5)
- { }
- protected:
- virtual ~EventMemberImpl5 () {}
- private:
- virtual void Notify (void) {
- (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function) (m_a1, m_a2, m_a3, m_a4, m_a5);
+ {
+ }
+protected:
+ virtual ~EventMemberImpl5 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (EventMemberImplObjTraits<OBJ>::GetReference (m_obj).*m_function)(m_a1, m_a2, m_a3, m_a4, m_a5);
}
OBJ m_obj;
MEM m_function;
@@ -241,22 +272,27 @@
}
template <typename U1, typename T1>
-EventImpl * MakeEvent (void (*f) (U1), T1 a1)
+EventImpl * MakeEvent (void (*f)(U1), T1 a1)
{
// one arg version
- class EventFunctionImpl1 : public EventImpl {
- public:
+ class EventFunctionImpl1 : public EventImpl
+ {
+public:
typedef void (*F)(U1);
-
- EventFunctionImpl1 (F function, T1 a1)
+
+ EventFunctionImpl1 (F function, T1 a1)
: m_function (function),
m_a1 (a1)
- { }
- protected:
- virtual ~EventFunctionImpl1 () {}
- private:
- virtual void Notify (void) {
- (*m_function) (m_a1);
+ {
+ }
+protected:
+ virtual ~EventFunctionImpl1 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (*m_function)(m_a1);
}
F m_function;
typename TypeTraits<T1>::ReferencedType m_a1;
@@ -265,23 +301,28 @@
}
template <typename U1, typename U2, typename T1, typename T2>
-EventImpl * MakeEvent (void (*f) (U1,U2), T1 a1, T2 a2)
+EventImpl * MakeEvent (void (*f)(U1,U2), T1 a1, T2 a2)
{
// two arg version
- class EventFunctionImpl2 : public EventImpl {
- public:
+ class EventFunctionImpl2 : public EventImpl
+ {
+public:
typedef void (*F)(U1, U2);
-
- EventFunctionImpl2 (F function, T1 a1, T2 a2)
+
+ EventFunctionImpl2 (F function, T1 a1, T2 a2)
: m_function (function),
m_a1 (a1),
m_a2 (a2)
- {}
- protected:
- virtual ~EventFunctionImpl2 () {}
- private:
- virtual void Notify (void) {
- (*m_function) (m_a1, m_a2);
+ {
+ }
+protected:
+ virtual ~EventFunctionImpl2 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (*m_function)(m_a1, m_a2);
}
F m_function;
typename TypeTraits<T1>::ReferencedType m_a1;
@@ -292,24 +333,29 @@
template <typename U1, typename U2, typename U3,
typename T1, typename T2, typename T3>
-EventImpl * MakeEvent (void (*f) (U1,U2,U3), T1 a1, T2 a2, T3 a3)
+EventImpl * MakeEvent (void (*f)(U1,U2,U3), T1 a1, T2 a2, T3 a3)
{
// three arg version
- class EventFunctionImpl3 : public EventImpl {
- public:
+ class EventFunctionImpl3 : public EventImpl
+ {
+public:
typedef void (*F)(U1, U2, U3);
-
- EventFunctionImpl3 (F function, T1 a1, T2 a2, T3 a3)
+
+ EventFunctionImpl3 (F function, T1 a1, T2 a2, T3 a3)
: m_function (function),
m_a1 (a1),
m_a2 (a2),
m_a3 (a3)
- { }
- protected:
- virtual ~EventFunctionImpl3 () {}
- private:
- virtual void Notify (void) {
- (*m_function) (m_a1, m_a2, m_a3);
+ {
+ }
+protected:
+ virtual ~EventFunctionImpl3 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (*m_function)(m_a1, m_a2, m_a3);
}
F m_function;
typename TypeTraits<T1>::ReferencedType m_a1;
@@ -321,25 +367,30 @@
template <typename U1, typename U2, typename U3, typename U4,
typename T1, typename T2, typename T3, typename T4>
-EventImpl * MakeEvent (void (*f) (U1,U2,U3,U4), T1 a1, T2 a2, T3 a3, T4 a4)
+EventImpl * MakeEvent (void (*f)(U1,U2,U3,U4), T1 a1, T2 a2, T3 a3, T4 a4)
{
// four arg version
- class EventFunctionImpl4 : public EventImpl {
- public:
+ class EventFunctionImpl4 : public EventImpl
+ {
+public:
typedef void (*F)(U1, U2, U3, U4);
-
- EventFunctionImpl4 (F function, T1 a1, T2 a2, T3 a3, T4 a4)
+
+ EventFunctionImpl4 (F function, T1 a1, T2 a2, T3 a3, T4 a4)
: m_function (function),
m_a1 (a1),
m_a2 (a2),
m_a3 (a3),
m_a4 (a4)
- { }
- protected:
- virtual ~EventFunctionImpl4 () {}
- private:
- virtual void Notify (void) {
- (*m_function) (m_a1, m_a2, m_a3, m_a4);
+ {
+ }
+protected:
+ virtual ~EventFunctionImpl4 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (*m_function)(m_a1, m_a2, m_a3, m_a4);
}
F m_function;
typename TypeTraits<T1>::ReferencedType m_a1;
@@ -352,26 +403,31 @@
template <typename U1, typename U2, typename U3, typename U4, typename U5,
typename T1, typename T2, typename T3, typename T4, typename T5>
-EventImpl * MakeEvent (void (*f) (U1,U2,U3,U4,U5), T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
+EventImpl * MakeEvent (void (*f)(U1,U2,U3,U4,U5), T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
{
// five arg version
- class EventFunctionImpl5 : public EventImpl {
- public:
+ class EventFunctionImpl5 : public EventImpl
+ {
+public:
typedef void (*F)(U1,U2,U3,U4,U5);
-
- EventFunctionImpl5 (F function, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
+
+ EventFunctionImpl5 (F function, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
: m_function (function),
m_a1 (a1),
m_a2 (a2),
m_a3 (a3),
m_a4 (a4),
m_a5 (a5)
- {}
- protected:
- virtual ~EventFunctionImpl5 () {}
- private:
- virtual void Notify (void) {
- (*m_function) (m_a1, m_a2, m_a3, m_a4, m_a5);
+ {
+ }
+protected:
+ virtual ~EventFunctionImpl5 ()
+ {
+ }
+private:
+ virtual void Notify (void)
+ {
+ (*m_function)(m_a1, m_a2, m_a3, m_a4, m_a5);
}
F m_function;
typename TypeTraits<T1>::ReferencedType m_a1;