Merge remote branch 'origin/topic/python' into topic/singleton

Conflicts:
	src/factory/pool.cpp

include/sot/core/derivator.hh

@@ -59,6 +59,7 @@ class Derivator
  public: /* --- CONSTRUCTION --- */
 
   static std::string getTypeName( void ) { return "Unknown"; }
+  virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
   static const std::string CLASS_NAME;
 
   Derivator( const std::string& name )
@@ -75,7 +76,6 @@ class Derivator
       timestepSIN.setKeepReference(true);
     }
 
-
   virtual ~Derivator( void ) {};
 
  public: /* --- SIGNAL --- */

include/sot/core/gripper-control.hh

@@ -112,7 +112,7 @@ class SOTGRIPPERCONTROL_EXPORT GripperControlPlugin
 
   GripperControlPlugin( const std::string& name );
   virtual ~GripperControlPlugin( void );
-
+  virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
  public: /* --- SIGNAL --- */
 
   /* --- INPUTS --- */

include/sot/core/reader.hh

@@ -72,7 +72,7 @@ class SOTREADER_EXPORT sotReader
 {
  public: 
   static const std::string CLASS_NAME;
-  virtual const std::string& getClassName( void ) { return CLASS_NAME; }
+  virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
 
  public: 
 

include/sot/core/sequencer.hh

@@ -67,6 +67,7 @@ namespace dynamicgraph {
       {
       public:
 	static const std::string CLASS_NAME;
+	virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
 
       public:
 	class sotEventAbstract

src/factory/pool.cpp

@@ -187,7 +187,6 @@ namespace dynamicgraph {
     {
     }
 
-
     PoolStorage* PoolStorage::getInstance()
     {
       if (instance_ == 0) {