Commit 7ad3c601 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

Merge branch 'master' into devel

parents 27587d25 d0431fb8
Pipeline #10166 passed with stage
in 4 minutes and 35 seconds
......@@ -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})
......
......@@ -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";
}
......
......@@ -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>
......
......@@ -32,6 +32,7 @@ public:
class LoggerIOStream : public LoggerStream {
public:
LoggerIOStream(std::ostream &os) : os_(os) {}
virtual ~LoggerIOStream() {}
virtual void write(const char *c) { os_ << c; }
private:
......
......@@ -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();
}
Markdown is supported
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