Merge pull request #91 from nim65s/devel

update deprecations for C++14

include/dynamic-graph/logger.h

@@ -221,15 +221,16 @@ public:
    *    stream(type, lineId) << msg << '\n';
    *  \endcode
    */
-  void sendMsg(std::string msg, MsgType type, const std::string &lineId = "");
+  [[deprecated("use stream(type, lineId) << msg")]] void
+  sendMsg(std::string msg, MsgType type, const std::string &lineId = "");
 
   /** \deprecated instead, use
    *  \code
    *    stream(type, lineId) << msg << '\n';
    *  \endcode
    */
-  void sendMsg(std::string msg, MsgType type, const std::string &file,
-               int line) DYNAMIC_GRAPH_DEPRECATED;
+  [[deprecated("use stream(type, lineId) << msg")]] void
+  sendMsg(std::string msg, MsgType type, const std::string &file, int line);
 
   /** Set the sampling time at which the method countdown()
    * is going to be called. */

include/dynamic-graph/signal-ptr.h

@@ -9,8 +9,6 @@
 #include <dynamic-graph/exception-signal.h>
 #include <dynamic-graph/signal.h>
 
-#include <dynamic-graph/deprecated.hh>
-
 namespace dynamicgraph {
 /// \ingroup dgraph
 ///

src/dgraph/entity.cpp

@@ -209,5 +209,5 @@ Command *Entity::getNewStyleCommand(const std::string &commandName) {
 
 void Entity::sendMsg(const std::string &msg, MsgType t,
                      const std::string &lineId) {
-  logger_.sendMsg("[" + name + "]" + msg, t, lineId);
+  logger_.stream(t, lineId) << "[" << name << "]" << msg << '\n';
 }