From 1e6ee7b273a4af825f33d5075db8789fd17c05a9 Mon Sep 17 00:00:00 2001 From: rpeschke Date: Wed, 2 Sep 2015 17:16:40 +0200 Subject: [PATCH 1/2] Added DLLExport statements for classes which are exported from the DLL --- main/include/eudaq/MachineState.hh | 3 ++- main/include/eudaq/TransportBase.hh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main/include/eudaq/MachineState.hh b/main/include/eudaq/MachineState.hh index 91a4129ead..544ef41676 100644 --- a/main/include/eudaq/MachineState.hh +++ b/main/include/eudaq/MachineState.hh @@ -6,11 +6,12 @@ #include #include "eudaq/Status.hh" #include "eudaq/TransportBase.hh" +#include "eudaq/Platform.hh" namespace eudaq { - class MachineState + class DLLEXPORT MachineState { public: diff --git a/main/include/eudaq/TransportBase.hh b/main/include/eudaq/TransportBase.hh index 9c4962c4bf..cb4daff498 100644 --- a/main/include/eudaq/TransportBase.hh +++ b/main/include/eudaq/TransportBase.hh @@ -13,13 +13,14 @@ #include #include #include +#include "eudaq/Platform.hh" namespace eudaq { /** Represents an individual connection on a Transport. * */ - class ConnectionInfo { + class DLLEXPORT ConnectionInfo { public: explicit ConnectionInfo(const std::string &name = "") : m_state(0), m_name(name) {} From 861ba2ea28603b09c6e62737f0479494be708340 Mon Sep 17 00:00:00 2001 From: rpeschke Date: Wed, 2 Sep 2015 17:17:11 +0200 Subject: [PATCH 2/2] using of the new interface of the set status class --- producers/root/src/ROOTProducer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/producers/root/src/ROOTProducer.cpp b/producers/root/src/ROOTProducer.cpp index aed9696dce..ff294a5820 100644 --- a/producers/root/src/ROOTProducer.cpp +++ b/producers/root/src/ROOTProducer.cpp @@ -210,7 +210,7 @@ void ROOTProducer::Producer_PImpl::OnConfigure(const eudaq::Configuration & conf // At the end, set the status that will be displayed in the Run Control. - SetStatus(eudaq::Status::LVL_OK, "Configured (" + config.Name() + ")"); + SetStatus(eudaq::Status::STATE_CONF, "Configured (" + config.Name() + ")"); } eudaq::Configuration& ROOTProducer::Producer_PImpl::getConfiguration() @@ -258,7 +258,7 @@ void ROOTProducer::Producer_PImpl::OnStartRun(unsigned param) // At the end, set the status that will be displayed in the Run Control. - SetStatus(eudaq::Status::LVL_OK, "Running"); + SetStatus(eudaq::Status::STATE_RUNNING, "Running"); } bool ROOTProducer::Producer_PImpl::timeout(int tries)