Commit c90a5d90 authored by Alessio Netti's avatar Alessio Netti

Compilation fixes for DEEP-EST prototype

parent 120ab444
...@@ -49,7 +49,6 @@ class ConfiguratorTemplateEntity : public ConfiguratorTemplate<SBase, SGroup> { ...@@ -49,7 +49,6 @@ class ConfiguratorTemplateEntity : public ConfiguratorTemplate<SBase, SGroup> {
//mention all required parent attributes and functions here to avoid compiler errors //mention all required parent attributes and functions here to avoid compiler errors
using ConfiguratorInterface::_cfgPath; using ConfiguratorInterface::_cfgPath;
using ConfiguratorInterface::_mqttPrefix; using ConfiguratorInterface::_mqttPrefix;
using ConfiguratorInterface::lg;
using ConfiguratorInterface::readGlobal; using ConfiguratorInterface::readGlobal;
using ConfiguratorTemplate<SBase, SGroup>::_baseName; using ConfiguratorTemplate<SBase, SGroup>::_baseName;
using ConfiguratorTemplate<SBase, SGroup>::_groupName; using ConfiguratorTemplate<SBase, SGroup>::_groupName;
...@@ -491,6 +490,7 @@ class ConfiguratorTemplateEntity : public ConfiguratorTemplate<SBase, SGroup> { ...@@ -491,6 +490,7 @@ class ConfiguratorTemplateEntity : public ConfiguratorTemplate<SBase, SGroup> {
std::string _entityName; std::string _entityName;
LOGGER lg;
std::vector<SEntity *> _sensorEntitys; std::vector<SEntity *> _sensorEntitys;
sEntityMap_t _templateSensorEntitys; sEntityMap_t _templateSensorEntitys;
}; };
......
...@@ -56,7 +56,6 @@ class SensorGroupTemplateEntity : public SensorGroupTemplate<S> { ...@@ -56,7 +56,6 @@ class SensorGroupTemplateEntity : public SensorGroupTemplate<S> {
using SensorGroupInterface::_keepRunning; using SensorGroupInterface::_keepRunning;
using SensorGroupInterface::_pendingTasks; using SensorGroupInterface::_pendingTasks;
using SensorGroupInterface::_timer; using SensorGroupInterface::_timer;
using SensorGroupInterface::lg;
using SensorGroupInterface::nextReadingTime; using SensorGroupInterface::nextReadingTime;
using SensorGroupTemplate<S>::_sensors; using SensorGroupTemplate<S>::_sensors;
...@@ -159,6 +158,7 @@ class SensorGroupTemplateEntity : public SensorGroupTemplate<S> { ...@@ -159,6 +158,7 @@ class SensorGroupTemplateEntity : public SensorGroupTemplate<S> {
_pendingTasks--; _pendingTasks--;
} }
LOGGER lg;
E *_entity; ///< Entity this group is associated to E *_entity; ///< Entity this group is associated to
}; };
......
...@@ -124,7 +124,7 @@ void IPMISensorGroup::read() { ...@@ -124,7 +124,7 @@ void IPMISensorGroup::read() {
std::vector<reading_t> readings; std::vector<reading_t> readings;
LenovoXCC xcc(_entity); LenovoXCC xcc(_entity);
if (_entity->getXCC()->getDatastorePower(readings) == 0) { if (_entity->getXCC()->getDatastorePower(readings) == 0) {
for (int i=0; i<readings.size(); i++) { for (unsigned int i=0; i<readings.size(); i++) {
s->storeReading(readings[i], s->getFactor()); s->storeReading(readings[i], s->getFactor());
} }
reading = readings.back(); reading = readings.back();
......
...@@ -2,7 +2,7 @@ include ../../config.mk ...@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbconfig.o sensoraction.o dbaction.o useraction.o OBJS = dcdbconfig.o sensoraction.o dbaction.o useraction.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
# GCC 4.8 is broken # GCC 4.8 is broken
ifeq ($(findstring 4.8, $(shell $(CXX) --version)), 4.8) ifeq ($(findstring 4.8, $(shell $(CXX) --version)), 4.8)
SLIBS = $(DCDBDEPLOYPATH)/lib/libboost_random.a $(DCDBDEPLOYPATH)/lib/libboost_system.a SLIBS = $(DCDBDEPLOYPATH)/lib/libboost_random.a $(DCDBDEPLOYPATH)/lib/libboost_system.a
......
...@@ -2,7 +2,7 @@ include ../../config.mk ...@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbquery.o query.o OBJS = dcdbquery.o query.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
TARGET = dcdbquery TARGET = dcdbquery
.PHONY : clean install .PHONY : clean install
......
...@@ -2,7 +2,7 @@ include ../../config.mk ...@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbquerysum.o OBJS = dcdbquerysum.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
TARGET = dcdbquerysum TARGET = dcdbquerysum
.PHONY : clean install .PHONY : clean install
......
...@@ -2,7 +2,7 @@ include ../../config.mk ...@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbslurmjob.o OBJS = dcdbslurmjob.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -lmosquitto -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -lmosquitto -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
TARGET = dcdbslurmjob TARGET = dcdbslurmjob
.PHONY : clean install .PHONY : clean install
......
...@@ -2,7 +2,7 @@ include ../../config.mk ...@@ -2,7 +2,7 @@ include ../../config.mk
CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include CXXFLAGS += -I../../common/include/ -I../../lib/include -I$(DCDBDEPLOYPATH)/include
OBJS = dcdbunitconv.o OBJS = dcdbunitconv.o
LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto LIBS = -L../../lib -L$(DCDBDEPLOYPATH)/lib -ldcdb -lcassandra -luv -lboost_random -lboost_system -lboost_date_time -lboost_regex -lssl -lcrypto -lpthread
TARGET = dcdbunitconv TARGET = dcdbunitconv
.PHONY : clean install .PHONY : clean install
......
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