Skip to content

Commit 9d38d93

Browse files
Noëlie Ramuzatolivier-stasse
authored andcommitted
[signal] Fix the macros declaring signals
DECLARE_SIGNAL_IN, CONSTRUCT_SIGNAL_IN, DECLARE_SIGNAL_OUT and CONSTRUCT_SIGNAL_OUT The macros were duplicated in various SoT packages. Unify them by: * Adding prefix m_ and suffix SIN for input signals declared as fields of entity classes. * Adding prefix m_ and suffix SOUT for output signals declared as fields of entity classes.
1 parent 9bd18a2 commit 9d38d93

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

include/dynamic-graph/signal-helper.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
/* --- MACROS ---------------------------------------------------------- */
3131
#define SIGNAL_OUT_FUNCTION_NAME(name) name##SOUT_function
3232

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 )
3535
#define BIND_SIGNAL_TO_FUNCTION(name,IO,type) m_##name##S##IO.setFunction(boost::bind(&EntityClassName::SIGNAL_OUT_FUNCTION_NAME(name),this,_1,_2));
3636

3737
/**/
3838

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 )
4141

4242
/**/
4343

@@ -51,12 +51,12 @@
5151

5252
#define DECLARE_SIGNAL_OUT( name,type ) \
5353
public: \
54-
::dynamicgraph::SignalTimeDependent<type,int> name##SOUT; \
54+
::dynamicgraph::SignalTimeDependent<type,int> m_##name##SOUT; \
5555
protected: \
5656
type& SIGNAL_OUT_FUNCTION(name)( type&,int )
5757

5858
#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), \
6060
dep,getClassName()+"("+getName()+")::output("+#type+")::"+#name )
6161

6262

0 commit comments

Comments
 (0)