Commit cc990385 authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

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

Conflicts:
	src/factory/pool.cpp
parents e8e51ee0 fafd7e7b
......@@ -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 --- */
......
......@@ -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 --- */
......
......@@ -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:
......
......@@ -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
......
......@@ -187,7 +187,6 @@ namespace dynamicgraph {
{
}
PoolStorage* PoolStorage::getInstance()
{
if (instance_ == 0) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment