diff --git a/include/sot/core/derivator.hh b/include/sot/core/derivator.hh index 5ad3c3c06345eb551cf4196d386b8291c8f57945..5ed8ba6011b59872de8cf5df1f7b4570a19e9c63 100644 --- a/include/sot/core/derivator.hh +++ b/include/sot/core/derivator.hh @@ -47,11 +47,10 @@ namespace dg = dynamicgraph; /* --------------------------------------------------------------------- */ template< class T > -class Derivator -:public dg::Entity +class Derivator : public dg::Entity { DYNAMIC_GRAPH_ENTITY_DECL(); - protected: +protected: T memory; bool initialized; double timestep; @@ -61,7 +60,6 @@ class Derivator static std::string getTypeName( void ) { return "Unknown"; } - Derivator( const std::string& name ) : dg::Entity(name) ,memory(),initialized(false) diff --git a/include/sot/core/gripper-control.hh b/include/sot/core/gripper-control.hh index 93fe0ba5c4eb366e3458a1781ef64a097206abdc..758d8fbe804496d58f269b1da68d724415df85fa 100644 --- a/include/sot/core/gripper-control.hh +++ b/include/sot/core/gripper-control.hh @@ -61,6 +61,7 @@ namespace dg = dynamicgraph; class SOTGRIPPERCONTROL_EXPORT GripperControl { + DYNAMIC_GRAPH_ENTITY_DECL(); protected: double offset; diff --git a/include/sot/core/reader.hh b/include/sot/core/reader.hh index 5ee2e4fddd4ada5d214bfc57659d61eace748f5e..b0a6eb280b1494694ca113b7f919231dbd230195 100644 --- a/include/sot/core/reader.hh +++ b/include/sot/core/reader.hh @@ -71,7 +71,6 @@ class SOTREADER_EXPORT sotReader : public Entity { DYNAMIC_GRAPH_ENTITY_DECL(); - public: SignalPtr< Flags,int > selectionSIN; diff --git a/include/sot/core/sequencer.hh b/include/sot/core/sequencer.hh index a17804530d2873420f68f34ccb866e4df1467990..f935c218bf7f28f453556c81d43de0284c877439 100644 --- a/include/sot/core/sequencer.hh +++ b/include/sot/core/sequencer.hh @@ -66,7 +66,6 @@ namespace dynamicgraph { :public dynamicgraph::Entity { DYNAMIC_GRAPH_ENTITY_DECL(); - public: class sotEventAbstract {