|
30 | 30 | /* --- MACROS ---------------------------------------------------------- */ |
31 | 31 | #define SIGNAL_OUT_FUNCTION_NAME(name) name##SOUT_function |
32 | 32 |
|
33 | | -#define DECLARE_SIGNAL( name,IO,type ) ::dynamicgraph::Signal<type,int> name##S##IO |
34 | | -#define CONSTRUCT_SIGNAL( name,IO,type ) name##S##IO( getClassName()+"("+getName()+")::"+#IO+"put("+#type+")::"+#name ) |
| 33 | +#define DECLARE_SIGNAL( name,IO,type ) ::dynamicgraph::Signal<type,int> m_##name##S##IO |
| 34 | +#define CONSTRUCT_SIGNAL( name,IO,type ) m_##name##S##IO( getClassName()+"("+getName()+")::"+#IO+"put("+#type+")::"+#name ) |
35 | 35 | #define BIND_SIGNAL_TO_FUNCTION(name,IO,type) m_##name##S##IO.setFunction(boost::bind(&EntityClassName::SIGNAL_OUT_FUNCTION_NAME(name),this,_1,_2)); |
36 | 36 |
|
37 | 37 | /**/ |
38 | 38 |
|
39 | | -#define DECLARE_SIGNAL_IN( name,type ) ::dynamicgraph::SignalPtr<type,int> name##SIN |
40 | | -#define CONSTRUCT_SIGNAL_IN( name,type ) name##SIN( NULL,getClassName()+"("+getName()+")::input("+#type+")::"+#name ) |
| 39 | +#define DECLARE_SIGNAL_IN( name,type ) ::dynamicgraph::SignalPtr<type,int> m_##name##SIN |
| 40 | +#define CONSTRUCT_SIGNAL_IN( name,type ) m_##name##SIN( NULL,getClassName()+"("+getName()+")::input("+#type+")::"+#name ) |
41 | 41 |
|
42 | 42 | /**/ |
43 | 43 |
|
|
51 | 51 |
|
52 | 52 | #define DECLARE_SIGNAL_OUT( name,type ) \ |
53 | 53 | public: \ |
54 | | - ::dynamicgraph::SignalTimeDependent<type,int> name##SOUT; \ |
| 54 | + ::dynamicgraph::SignalTimeDependent<type,int> m_##name##SOUT; \ |
55 | 55 | protected: \ |
56 | 56 | type& SIGNAL_OUT_FUNCTION(name)( type&,int ) |
57 | 57 |
|
58 | 58 | #define CONSTRUCT_SIGNAL_OUT( name,type,dep ) \ |
59 | | - name##SOUT( boost::bind(& EntityClassName::name##SOUT_function,this,_1,_2), \ |
| 59 | + m_##name##SOUT( boost::bind(& EntityClassName::name##SOUT_function,this,_1,_2), \ |
60 | 60 | dep,getClassName()+"("+getName()+")::output("+#type+")::"+#name ) |
61 | 61 |
|
62 | 62 |
|
|
0 commit comments