Merge branch 'master' into devel

Author: nim65s

CMakeLists.txt

@@ -126,7 +126,8 @@ SET(${PROJECT_NAME}_SOURCES
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED
   ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
-TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR})
+TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS})
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Boost_LIBRARIES})
 

include/dynamic-graph/command-bind.h

@@ -434,7 +434,7 @@ makeCommandReturnType0(E &entity, ReturnType (E::*function)(void),
 
 template <typename ReturnType>
 inline std::string docCommandReturnType0(const std::string &doc,
-                                         const std::string &return_type) {
+                                         const std::string & /* return_type */) {
   return std::string("\n") + doc + "\n\nNo input.\n" +
          typeid(ReturnType).name() + " return.\n\n";
 }

include/dynamic-graph/process-list.hh

@@ -4,7 +4,7 @@
  */
 
 #ifndef DYNAMIC_GRAPH_PROCESS_LIST_H_
-#define DYNAMIC_GRAPH_PROCESS_LIST_H
+#define DYNAMIC_GRAPH_PROCESS_LIST_H_
 
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>

include/dynamic-graph/real-time-logger-def.h

@@ -32,6 +32,7 @@ class LoggerStream {
 class LoggerIOStream : public LoggerStream {
 public:
   LoggerIOStream(std::ostream &os) : os_(os) {}
+  virtual ~LoggerIOStream() {}
   virtual void write(const char *c) { os_ << c; }
 
 private:

src/mt/process-list.cpp

@@ -141,8 +141,8 @@ void System::readProcStat() {
   if (!init_) {
     /// The number of CPU has been detected by going through /proc/stat.
     vCPUData_.resize(cpuNb_ + 1);
-    for (int i = 0; i < (int)cpuNb_; i++)
-      vCPUData_[i].cpu_id_ = i;
+    for (unsigned long i = 0; i < (unsigned long )cpuNb_; i++)
+      vCPUData_[i].cpu_id_ = (int)i;
   }
   aif.close();
 }