Merge remote-tracking branch 'origin/coverage' into coverage

include/dynamic-graph/signal-ptr.h

@@ -62,11 +62,7 @@ namespace dynamicgraph
     const SignalBase<Time>* getAbstractPtr () const; // throw
     virtual void plug( SignalBase<Time>* ref );
 
-    //Useless function, didn't find any use of this one
-    /*virtual void unplug () { plug(NULL); }
-    virtual bool isPluged () const DYNAMIC_GRAPH_DEPRECATED {
-      return isPlugged ();
-    }*/
+    virtual void unplug () { plug(NULL); }
 
     virtual bool isPlugged () const { return (NULL!=signalPtr); }
     virtual SignalBase<Time>* getPluged () const { return signalPtr; }

src/debug/logger.cpp

@@ -61,13 +61,11 @@ namespace dynamicgraph
        (m_lv==VERBOSITY_INFO_WARNING_ERROR && isDebugMsg(type)))
       return;
 
-    //TODO Modif ici
     // if print is allowed by current verbosity level
     if( isStreamMsg(type))
       {
-        int l = line;
         // check whether counter already exists
-        string id = file+/*toString(line)*/+ l;
+        string id = file+toString(line);
         map<string,double>::iterator it = m_stream_msg_counters.find(id);
         if(it == m_stream_msg_counters.end())
 	  {

tests/factory.cpp

 // Copyright 2010 Thomas Moulard.
 //
 
-#include <iostream>
 #include <sstream>
 #include <dynamic-graph/factory.h>
 #include <dynamic-graph/entity.h>

tests/signal-cast-registerer.cpp

@@ -88,31 +88,13 @@ struct EigenCastRegisterer_M : public dynamicgraph::SignalCastRegisterer
     static void dispMatrix (const boost::any& object, std::ostream& os)
     {
         const bnuMatrix& m = boost::any_cast<bnuMatrix> (object);
-        os << "[ ";
-        for (int i = 0; i < m.rows(); ++i){
-            os << "[ ";
-            for (int j = 0; j < m.cols(); ++j) {
-                os << m(i, j) << " ";
-            }
-            if (i != m.rows()-1){
-                os << "]; ";
-            }
-            else{
-                os << "] ";
-            }
-        }
-        os << " ];" << std::endl;
+        os << m << std::endl;
     }
 
     static void traceMatrix (const boost::any& object, std::ostream& os)
     {
         const bnuMatrix& m = boost::any_cast<bnuMatrix> (object);
-        for (int i = 0; i < m.rows(); ++i){
-            for (int j = 0; j < m.cols(); ++j){
-                os << m(i,j) << " ";
-            }
-        }
-        os << std::endl;
+        os << m << std::endl;
     }
 };
 
@@ -371,22 +353,3 @@ BOOST_AUTO_TEST_CASE (custom_matrix_registerer) {
 
     //[...]((...))
 }
-
-// One issue with the strategy used by the
-// dynamicgraph::SignalCastRegisterer is that it relies on the
-// typeid. In practice, it means that two signals defined in two
-// different libraries will have different typeid and one will not be
-// able to plug one into the other unless the symbol have merged when
-// the plug-in is loaded. See man(3) dlopen in Linux for more
-// information about plug-in loading and the RTLD_GLOBAL flag
-// necessary to make cast registerer work as expected.
-//
-// Here we make sure that two instances of the same type
-// declared in two separate libraries are resolved into the
-// same typeid.
-/*BOOST_AUTO_TEST_CASE (typeid_issue)
-{
-  BOOST_CHECK (typeid(vA) == typeid(vB));
-  BOOST_CHECK_EQUAL (std::string (typeid(vA).name ()),
-		     std::string (typeid(vB).name ()));
-}*/
\ No newline at end of file