From c833bc08a6fb5874ab5df85989976574f5aff091 Mon Sep 17 00:00:00 2001
From: Jonnhy Jazeix <jazeix@gmail.com>
Date: Sun, 16 Aug 2015 08:38:01 +0000
Subject: [PATCH] fix plugins compilation
---
plugins/CMakeLists.txt | 1 +
plugins/Distribution/Distribution.cpp | 6 +++---
plugins/TraceInfos/TraceInfos.cpp | 8 ++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 2123bdeb..97d96d08 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -9,6 +9,7 @@ option(VITE_PLUGINS_TRACEINFOS
"Enable the TraceInfos plugin." OFF)
include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_BINARY_DIR}/src/common)
if( VITE_PLUGINS_DISTRIBUTIONS )
add_subdirectory(Distribution)
diff --git a/plugins/Distribution/Distribution.cpp b/plugins/Distribution/Distribution.cpp
index c387207a..ba661847 100644
--- a/plugins/Distribution/Distribution.cpp
+++ b/plugins/Distribution/Distribution.cpp
@@ -143,7 +143,7 @@ private:
if (st)
{
- const std::string name = st->get_value()->get_name().to_string();
+ const std::string name = st->get_value()->get_name();
/* does the name appear in the set of selected names ? */
std::set<std::string>::const_iterator it = selected_state_types_names.find(name);
@@ -267,14 +267,14 @@ private:
const State *left_st = node->get_element()->get_left_state();
if (left_st)
{
- const std::string name = left_st->get_value()->get_name().to_string();
+ const std::string name = left_st->get_value()->get_name();
name_set.insert(name);
}
const State *right_st = node->get_element()->get_right_state();
if (right_st)
{
- const std::string name = right_st->get_value()->get_name().to_string();
+ const std::string name = right_st->get_value()->get_name();
name_set.insert(name);
}
diff --git a/plugins/TraceInfos/TraceInfos.cpp b/plugins/TraceInfos/TraceInfos.cpp
index 2e6c1dba..d59bc469 100644
--- a/plugins/TraceInfos/TraceInfos.cpp
+++ b/plugins/TraceInfos/TraceInfos.cpp
@@ -61,13 +61,13 @@ void Trace_infos::get_states_name_rec(Node<StateChange> *parent, set<string> &st
const State *left_state = top_state->get_left_state();
const State *right_state = top_state->get_right_state();
if(left_state && left_state->get_value()) {
- state_list.insert(left_state->get_value()->get_name().to_string());
- //cout << left_state->get_value()->get_name().to_string() << endl;
+ state_list.insert(left_state->get_value()->get_name());
+ //cout << left_state->get_value()->get_name() << endl;
get_states_name_rec(parent->get_left_child(), state_list);
}
if(right_state && right_state->get_value()) {
- state_list.insert(right_state->get_value()->get_name().to_string());
- //cout << right_state->get_value()->get_name().to_string() << endl;
+ state_list.insert(right_state->get_value()->get_name());
+ //cout << right_state->get_value()->get_name() << endl;
get_states_name_rec(parent->get_right_child(), state_list);
}
}
--
GitLab