# HG changeset patch
# User Tommaso Pecorella <tommaso.pecorella@unifi.it>
# Date 1442601130 -7200
# Parent  7133001a5dea04ca14ddc6448bc782379b4d35f5
Xcode 7.0

diff --git a/src/core/model/make-event.h b/src/core/model/make-event.h
--- a/src/core/model/make-event.h
+++ b/src/core/model/make-event.h
@@ -507,9 +507,7 @@
   class EventFunctionImpl1 : public EventImpl
   {
 public:
-    typedef void (*F)(U1);
-
-    EventFunctionImpl1 (F function, T1 a1)
+    EventFunctionImpl1 (void (*function)(U1), T1 a1)
       : m_function (function),
         m_a1 (a1)
     {
@@ -523,22 +521,20 @@
     {
       (*m_function)(m_a1);
     }
-    F m_function;
+    void (*m_function)(U1);
     typename TypeTraits<T1>::ReferencedType m_a1;
   } *ev = new EventFunctionImpl1 (f, a1);
   return ev;
 }
 
 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:
-    typedef void (*F)(U1, U2);
-
-    EventFunctionImpl2 (F function, T1 a1, T2 a2)
+    EventFunctionImpl2 (void (*function)(U1, U2), T1 a1, T2 a2)
       : m_function (function),
         m_a1 (a1),
         m_a2 (a2)
@@ -553,7 +549,7 @@
     {
       (*m_function)(m_a1, m_a2);
     }
-    F m_function;
+    void (*m_function)(U1, U2);
     typename TypeTraits<T1>::ReferencedType m_a1;
     typename TypeTraits<T2>::ReferencedType m_a2;
   } *ev = new EventFunctionImpl2 (f, a1, a2);
@@ -562,15 +558,13 @@
 
 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:
-    typedef void (*F)(U1, U2, U3);
-
-    EventFunctionImpl3 (F function, T1 a1, T2 a2, T3 a3)
+    EventFunctionImpl3 (void (*function)(U1, U2, U3), T1 a1, T2 a2, T3 a3)
       : m_function (function),
         m_a1 (a1),
         m_a2 (a2),
@@ -586,7 +580,7 @@
     {
       (*m_function)(m_a1, m_a2, m_a3);
     }
-    F m_function;
+    void (*m_function)(U1, U2, U3);
     typename TypeTraits<T1>::ReferencedType m_a1;
     typename TypeTraits<T2>::ReferencedType m_a2;
     typename TypeTraits<T3>::ReferencedType m_a3;
@@ -596,15 +590,13 @@
 
 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:
-    typedef void (*F)(U1, U2, U3, U4);
-
-    EventFunctionImpl4 (F function, T1 a1, T2 a2, T3 a3, T4 a4)
+    EventFunctionImpl4 (void (*function)(U1, U2, U3, U4), T1 a1, T2 a2, T3 a3, T4 a4)
       : m_function (function),
         m_a1 (a1),
         m_a2 (a2),
@@ -621,7 +613,7 @@
     {
       (*m_function)(m_a1, m_a2, m_a3, m_a4);
     }
-    F m_function;
+    void (*m_function)(U1, U2, U3, U4);
     typename TypeTraits<T1>::ReferencedType m_a1;
     typename TypeTraits<T2>::ReferencedType m_a2;
     typename TypeTraits<T3>::ReferencedType m_a3;
@@ -632,15 +624,13 @@
 
 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:
-    typedef void (*F)(U1,U2,U3,U4,U5);
-
-    EventFunctionImpl5 (F function, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
+    EventFunctionImpl5 (void (*function)(U1, U2, U3, U4, U5), T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
       : m_function (function),
         m_a1 (a1),
         m_a2 (a2),
@@ -658,7 +648,7 @@
     {
       (*m_function)(m_a1, m_a2, m_a3, m_a4, m_a5);
     }
-    F m_function;
+    void (*m_function)(U1, U2, U3, U4, U5);
     typename TypeTraits<T1>::ReferencedType m_a1;
     typename TypeTraits<T2>::ReferencedType m_a2;
     typename TypeTraits<T3>::ReferencedType m_a3;